Better message about optional test, warning suppression

CLIUtils · Apr 4, 2018 · bc895e3 · bc895e3
1 parent e0bcc36
commit bc895e3
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -19,6 +19,7 @@ build_script:
 
 test_script:
   - ctest --output-on-failure -C Debug
+  - ./tests/OptionalTest
 
 notifications:
   - provider: Webhook

diff --git a/.ci/make_and_test.sh b/.ci/make_and_test.sh
@@ -15,6 +15,7 @@ echo "Testing..."
 set -evx
 
 ctest --output-on-failure
+./tests/OptionalTest
 
 set +evx
 echo -en "travis_fold:end:script.test\\r"
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -27,7 +27,7 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
     if(MSVC)
         add_definitions("/W4")
     else()
-        add_definitions(-Wall -Wextra -pedantic)
+        add_definitions(-Wall -Wextra -pedantic -Wno-deprecated-declarations)
     endif()
 
     if(CMAKE_VERSION VERSION_GREATER 3.6)

diff --git a/include/CLI/Option.hpp b/include/CLI/Option.hpp
@@ -309,7 +309,7 @@ class Option : public OptionBase<Option> {
     template <typename T = App> Option *requires(std::string opt_name) {
         for(const Option_p &opt : dynamic_cast<T *>(parent_)->options_)
             if(opt.get() != this && opt->check_name(opt_name))
-                return requires(opt.get());
+                return needs(opt.get());
         throw IncorrectConstruction::MissingOption(opt_name);
     }
 

diff --git a/tests/OptionalTest.cpp b/tests/OptionalTest.cpp
@@ -1,10 +1,10 @@
 #include <cstdlib>
 #include <iostream>
 
-#if CLI11_OPTIONAL
-
 #include "app_helper.hpp"
 
+#if CLI11_OPTIONAL
+
 TEST_F(TApp, OptionalTest) {
     optional<int> opt;
     app.add_option("-c,--count", opt);
@@ -24,4 +24,8 @@ TEST_F(TApp, OptionalTest) {
     EXPECT_EQ(*opt, 3);
 }
 
+#else
+
+TEST_F(TApp, DISABLED_OptionalTest) {}
+
 #endif