diff options
| author | Phil Nash | 2011-02-16 19:02:09 +0000 |
|---|---|---|
| committer | Phil Nash | 2011-02-16 19:02:09 +0000 |
| commit | 73acd945cdc7e53892e1fc9e679bc2fbb99f9505 (patch) | |
| tree | 53048f1417dd8aaf53194bd14a103e004be028c2 /Test | |
| parent | dea778138ee2313a8dbb9fd0b3459e9166149aac (diff) | |
| download | catch3-73acd945cdc7e53892e1fc9e679bc2fbb99f9505.tar.gz | |
Fixed more warnings and applied workaround for getting to std::numeric_limits without clashing with Windows' min() and max() macros.
Diffstat (limited to 'Test')
| -rw-r--r-- | Test/ClassTests.cpp | 4 | ||||
| -rw-r--r-- | Test/GeneratorTests.cpp | 2 | ||||
| -rw-r--r-- | Test/MessageTests.cpp | 2 | ||||
| -rw-r--r-- | Test/Test.xcodeproj/project.pbxproj | 28 | ||||
| -rw-r--r-- | Test/TestMain.cpp | 1 |
5 files changed, 33 insertions, 4 deletions
diff --git a/Test/ClassTests.cpp b/Test/ClassTests.cpp index 8d456d4e..3cadd645 100644 --- a/Test/ClassTests.cpp +++ b/Test/ClassTests.cpp @@ -35,8 +35,8 @@ namespace } -METHOD_AS_TEST_CASE( TestClass::succeedingCase, "./succeeding/TestClass/succeedingCase", "A method based test run that succeeds" ); -METHOD_AS_TEST_CASE( TestClass::failingCase, "./failing/TestClass/failingCase", "A method based test run that fails" ); +METHOD_AS_TEST_CASE( TestClass::succeedingCase, "./succeeding/TestClass/succeedingCase", "A method based test run that succeeds" ) +METHOD_AS_TEST_CASE( TestClass::failingCase, "./failing/TestClass/failingCase", "A method based test run that fails" ) struct Fixture diff --git a/Test/GeneratorTests.cpp b/Test/GeneratorTests.cpp index 8dec53f5..db8ea2a1 100644 --- a/Test/GeneratorTests.cpp +++ b/Test/GeneratorTests.cpp @@ -12,7 +12,7 @@ #include "../catch.hpp" -size_t multiply( int a, int b ) +size_t multiply( size_t a, size_t b ) { return a*b; } diff --git a/Test/MessageTests.cpp b/Test/MessageTests.cpp index a8e067ed..af674f57 100644 --- a/Test/MessageTests.cpp +++ b/Test/MessageTests.cpp @@ -48,4 +48,4 @@ TEST_CASE( "./mixed/message/info/2", "INFO gets logged on failure" ) TEST_CASE( "./failing/message/fail", "FAIL aborts the test" ) { FAIL( "This is a " << "failure" ); // This should output the message and abort -}
\ No newline at end of file +} diff --git a/Test/Test.xcodeproj/project.pbxproj b/Test/Test.xcodeproj/project.pbxproj index 3901574b..68a12f74 100644 --- a/Test/Test.xcodeproj/project.pbxproj +++ b/Test/Test.xcodeproj/project.pbxproj @@ -321,7 +321,35 @@ GCC_C_LANGUAGE_STANDARD = gnu99; GCC_OPTIMIZATION_LEVEL = 0; GCC_PREPROCESSOR_DEFINITIONS = DEBUG; + GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; + GCC_TREAT_NONCONFORMANT_CODE_ERRORS_AS_WARNINGS = YES; + GCC_TREAT_WARNINGS_AS_ERRORS = NO; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_GLOBAL_CONSTRUCTORS = NO; + GCC_WARN_ABOUT_MISSING_FIELD_INITIALIZERS = YES; + GCC_WARN_ABOUT_MISSING_NEWLINE = YES; + GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO; GCC_WARN_ABOUT_RETURN_TYPE = YES; + GCC_WARN_CHECK_SWITCH_STATEMENTS = YES; + GCC_WARN_EFFECTIVE_CPLUSPLUS_VIOLATIONS = NO; + GCC_WARN_FOUR_CHARACTER_CONSTANTS = YES; + GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = YES; + GCC_WARN_INHIBIT_ALL_WARNINGS = NO; + GCC_WARN_INITIALIZER_NOT_FULLY_BRACKETED = YES; + GCC_WARN_MISSING_PARENTHESES = YES; + GCC_WARN_MULTIPLE_DEFINITION_TYPES_FOR_SELECTOR = YES; + GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; + GCC_WARN_PEDANTIC = YES; + GCC_WARN_PROTOTYPE_CONVERSION = YES; + GCC_WARN_SHADOW = YES; + GCC_WARN_SIGN_COMPARE = YES; + GCC_WARN_STRICT_SELECTOR_MATCH = YES; + GCC_WARN_UNINITIALIZED_AUTOS = NO; + GCC_WARN_UNKNOWN_PRAGMAS = YES; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_LABEL = YES; + GCC_WARN_UNUSED_PARAMETER = YES; + GCC_WARN_UNUSED_VALUE = YES; GCC_WARN_UNUSED_VARIABLE = YES; ONLY_ACTIVE_ARCH = YES; PREBINDING = NO; diff --git a/Test/TestMain.cpp b/Test/TestMain.cpp index 3bf7c311..b3d29805 100644 --- a/Test/TestMain.cpp +++ b/Test/TestMain.cpp @@ -26,6 +26,7 @@ TEST_CASE( "selftest/main", "Runs all Catch self tests and checks their results" CHECK( runner.getFailureCount() == 0 ); runner.runMatching( "./failing/*" ); + INFO( runner.getOutput() ); CHECK( runner.getSuccessCount() == 0 ); CHECK( runner.getFailureCount() == 53 ); } |