3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-22 13:26:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use main-as-static-lib in ExtraTests

Browse Source
This commit is contained in:
Martin Hořeňovský 2020-05-03 19:21:58 +02:00
parent 0c223bb751
commit c086746cc9
No known key found for this signature in database
GPG Key ID: DE48307B8B0D381A
6 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/ExtraTests/CMakeLists.txt
View File

@ -15,7 +15,7 @@ add_executable(PrefixedMacros ${TESTS_DIR}/X01-PrefixedMacros.cpp)
target_compile_definitions( PrefixedMacros PRIVATE CATCH_CONFIG_PREFIX_ALL CATCH_CONFIG_RUNTIME_STATIC_REQUIRE ) target_compile_definitions( PrefixedMacros PRIVATE CATCH_CONFIG_PREFIX_ALL CATCH_CONFIG_RUNTIME_STATIC_REQUIRE )
# Macro configuration does not touch the compiled parts, so we can link # Macro configuration does not touch the compiled parts, so we can link
# it against the main library # it against the main library
target_link_libraries( PrefixedMacros Catch2 ) target_link_libraries( PrefixedMacros Catch2WithMain )
add_test(NAME CATCH_CONFIG_PREFIX_ALL COMMAND PrefixedMacros -s) add_test(NAME CATCH_CONFIG_PREFIX_ALL COMMAND PrefixedMacros -s)
set_tests_properties( set_tests_properties(
@ -33,7 +33,7 @@ add_executable(DisabledMacros ${TESTS_DIR}/X02-DisabledMacros.cpp)
target_compile_definitions( DisabledMacros PRIVATE CATCH_CONFIG_DISABLE ) target_compile_definitions( DisabledMacros PRIVATE CATCH_CONFIG_DISABLE )
# Macro configuration does not touch the compiled parts, so we can link # Macro configuration does not touch the compiled parts, so we can link
# it against the main library # it against the main library
target_link_libraries( DisabledMacros Catch2 ) target_link_libraries( DisabledMacros Catch2WithMain )
add_test(NAME CATCH_CONFIG_DISABLE-1 COMMAND DisabledMacros -s) add_test(NAME CATCH_CONFIG_DISABLE-1 COMMAND DisabledMacros -s)
set_tests_properties( set_tests_properties(
@ -97,7 +97,7 @@ set_tests_properties(
add_executable(FallbackStringifier ${TESTS_DIR}/X10-FallbackStringifier.cpp) add_executable(FallbackStringifier ${TESTS_DIR}/X10-FallbackStringifier.cpp)
target_compile_definitions( FallbackStringifier PRIVATE CATCH_CONFIG_FALLBACK_STRINGIFIER=fallbackStringifier ) target_compile_definitions( FallbackStringifier PRIVATE CATCH_CONFIG_FALLBACK_STRINGIFIER=fallbackStringifier )
target_link_libraries( FallbackStringifier Catch2 ) target_link_libraries( FallbackStringifier Catch2WithMain )
add_test(NAME FallbackStringifier COMMAND FallbackStringifier -r compact -s) add_test(NAME FallbackStringifier COMMAND FallbackStringifier -r compact -s)
set_tests_properties( set_tests_properties(
@ -109,7 +109,7 @@ set_tests_properties(
add_executable(DisableStringification ${TESTS_DIR}/X11-DisableStringification.cpp) add_executable(DisableStringification ${TESTS_DIR}/X11-DisableStringification.cpp)
target_compile_definitions( DisableStringification PRIVATE CATCH_CONFIG_DISABLE_STRINGIFICATION ) target_compile_definitions( DisableStringification PRIVATE CATCH_CONFIG_DISABLE_STRINGIFICATION )
target_link_libraries(DisableStringification Catch2) target_link_libraries(DisableStringification Catch2WithMain)
add_test(NAME CATCH_CONFIG_DISABLE_STRINGIFICATION COMMAND DisableStringification -r compact -s) add_test(NAME CATCH_CONFIG_DISABLE_STRINGIFICATION COMMAND DisableStringification -r compact -s)
set_tests_properties( set_tests_properties(
CATCH_CONFIG_DISABLE_STRINGIFICATION CATCH_CONFIG_DISABLE_STRINGIFICATION
@ -126,7 +126,7 @@ if (MSVC)
set_property( TARGET WindowsHeader PROPERTY CXX_STANDARD 14 ) set_property( TARGET WindowsHeader PROPERTY CXX_STANDARD 14 )
set_property( TARGET WindowsHeader PROPERTY CXX_STANDARD_REQUIRED ON ) set_property( TARGET WindowsHeader PROPERTY CXX_STANDARD_REQUIRED ON )
set_property( TARGET WindowsHeader PROPERTY CXX_EXTENSIONS OFF ) set_property( TARGET WindowsHeader PROPERTY CXX_EXTENSIONS OFF )
target_link_libraries( WindowsHeader Catch2 ) target_link_libraries( WindowsHeader Catch2WithMain )
add_test(NAME WindowsHeader COMMAND WindowsHeader -r compact) add_test(NAME WindowsHeader COMMAND WindowsHeader -r compact)
list(APPEND CATCH_WARNING_TARGETS ${EXTRA_TEST_BINARIES} WindowsHeader) list(APPEND CATCH_WARNING_TARGETS ${EXTRA_TEST_BINARIES} WindowsHeader)
endif() endif()

5
tests/ExtraTests/X01-PrefixedMacros.cpp
View File

@ -1,9 +1,8 @@
// X11-DisableStringification.cpp // X01-DisableStringification.cpp
// Test that Catch's prefixed macros compile and run properly. // Test that Catch's prefixed macros compile and run properly.
#include <catch2/internal/catch_default_main.hpp>
// This won't provide full coverage, but it might be worth checking // This won't provide full coverage, but it might be worth checking
// the other branch as well // the other branch as well
#include <catch2/catch_test_macros.hpp> #include <catch2/catch_test_macros.hpp>
#include <catch2/matchers/catch_matchers_predicate.hpp> #include <catch2/matchers/catch_matchers_predicate.hpp>
#include <catch2/matchers/catch_matchers_string.hpp> #include <catch2/matchers/catch_matchers_string.hpp>

1
tests/ExtraTests/X02-DisabledMacros.cpp
View File

@ -2,7 +2,6 @@
// Test that CATCH_CONFIG_DISABLE turns off TEST_CASE autoregistration // Test that CATCH_CONFIG_DISABLE turns off TEST_CASE autoregistration
// and expressions in assertion macros are not run. // and expressions in assertion macros are not run.
#include <catch2/internal/catch_default_main.hpp>
#include <catch2/catch_test_macros.hpp> #include <catch2/catch_test_macros.hpp>
#include <iostream> #include <iostream>

1
tests/ExtraTests/X10-FallbackStringifier.cpp
View File

@ -9,7 +9,6 @@ std::string fallbackStringifier(T const&) {
return "{ !!! }"; return "{ !!! }";
} }
#include <catch2/internal/catch_default_main.hpp>
#include <catch2/catch_test_macros.hpp> #include <catch2/catch_test_macros.hpp>
struct foo { struct foo {

1
tests/ExtraTests/X11-DisableStringification.cpp
View File

@ -4,7 +4,6 @@
// and preprocessor token pasting. In other words, hopefully this test // and preprocessor token pasting. In other words, hopefully this test
// will be deleted soon :-) // will be deleted soon :-)
#include <catch2/internal/catch_default_main.hpp>
#include <catch2/catch_test_macros.hpp> #include <catch2/catch_test_macros.hpp>
namespace { namespace {

1
tests/ExtraTests/X90-WindowsHeaderInclusion.cpp
View File

@ -4,7 +4,6 @@
// wrong. // wrong.
#include <windows.h> #include <windows.h>
#include <catch2/internal/catch_default_main.hpp>
#include <catch2/catch_test_macros.hpp> #include <catch2/catch_test_macros.hpp>
TEST_CASE("Catch2 did survive compilation with windows.h", "[compile-test]") { TEST_CASE("Catch2 did survive compilation with windows.h", "[compile-test]") {