From f5cfe49e1cee43a7c1e0e53811a76d4c3785b799 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Sat, 17 Nov 2018 21:38:12 +0100 Subject: [PATCH 1/2] Update Catch to v2.4.2 GCC warns about catching exceptions by value, which is fixed in newer Catch release. v2.4.2 is the newest release to date. Additionally, update to Catch2's newer structure and use the provided cmake project. --- ext/CMakeLists.txt | 3 +-- ext/catch | 2 +- extras/boost/test/CMakeLists.txt | 4 ++-- extras/boost/test/OptionalTests.cpp | 2 +- extras/boost/test/main.cpp | 2 +- extras/catch/include/rapidcheck/catch.h | 4 ++-- extras/gmock/test/CMakeLists.txt | 2 +- extras/gmock/test/main.cpp | 2 +- test/AssertionsTests.cpp | 2 +- test/CMakeLists.txt | 2 +- test/CheckTests.cpp | 2 +- test/ClassifyTests.cpp | 2 +- test/GenTests.cpp | 2 +- test/LogTests.cpp | 2 +- test/MaybeTests.cpp | 2 +- test/RandomTests.cpp | 2 +- test/SeqTests.cpp | 2 +- test/ShowTests.cpp | 2 +- test/ShrinkableTests.cpp | 2 +- test/detail/AnyTests.cpp | 2 +- test/detail/ApplyTupleTests.cpp | 2 +- test/detail/Base64Tests.cpp | 2 +- test/detail/BitStreamTests.cpp | 2 +- test/detail/CaptureTests.cpp | 2 +- test/detail/ConfigurationTests.cpp | 2 +- test/detail/DefaultTestListenerTests.cpp | 2 +- test/detail/FrequencyMapTests.cpp | 2 +- test/detail/ImplicitParamTests.cpp | 2 +- test/detail/LogTestListenerTests.cpp | 2 +- test/detail/MapParserTests.cpp | 2 +- test/detail/MulticastTestListenerTests.cpp | 2 +- test/detail/PropertyTests.cpp | 2 +- test/detail/ReproduceListenerTests.cpp | 2 +- test/detail/ResultsTests.cpp | 2 +- test/detail/SerializationTests/CompactIntegers.cpp | 2 +- test/detail/SerializationTests/CompactRanges.cpp | 2 +- test/detail/SerializationTests/Integers.cpp | 2 +- test/detail/SerializationTests/Misc.cpp | 2 +- test/detail/ShowTypeTests.cpp | 2 +- test/detail/StringSerializationTests.cpp | 2 +- test/detail/TestMetadataTests.cpp | 2 +- test/detail/TestParamsTests.cpp | 2 +- test/detail/TestingTests.cpp | 2 +- test/detail/VariantTests.cpp | 2 +- test/fn/CommonTests.cpp | 2 +- test/gen/BuildTests.cpp | 2 +- test/gen/ChronoTests.cpp | 2 +- test/gen/ContainerTests/Fixed.cpp | 2 +- test/gen/ContainerTests/NonFixed.cpp | 2 +- test/gen/ContainerTests/Unique.cpp | 2 +- test/gen/CreateTests.cpp | 2 +- test/gen/ExecTests.cpp | 2 +- test/gen/MaybeTests.cpp | 2 +- test/gen/NumericTests.cpp | 2 +- test/gen/PredicateTests.cpp | 2 +- test/gen/SelectTests.cpp | 2 +- test/gen/TextTests.cpp | 2 +- test/gen/TransformTests.cpp | 2 +- test/gen/TupleTests.cpp | 2 +- test/gen/detail/ExecRawTests.cpp | 2 +- test/gen/detail/RecipeTests.cpp | 2 +- test/gen/detail/ScaleIntegerTests.cpp | 2 +- test/gen/detail/ShrinkValueIteratorTests.cpp | 2 +- test/main.cpp | 2 +- test/seq/CreateTests.cpp | 2 +- test/seq/OperationsTests.cpp | 2 +- test/seq/SeqIteratorTests.cpp | 2 +- test/seq/TransformTests.cpp | 2 +- test/shrink/ShrinkTests.cpp | 2 +- test/shrinkable/CreateTests.cpp | 2 +- test/shrinkable/OperationsTests.cpp | 2 +- test/shrinkable/TransformTests.cpp | 2 +- test/state/CommandTests.cpp | 2 +- test/state/CommandsTests.cpp | 2 +- test/state/IntegrationTests.cpp | 2 +- test/state/StateTests.cpp | 2 +- test/state/gen/CommandsTests.cpp | 2 +- test/util/Logger.h | 2 +- 78 files changed, 80 insertions(+), 81 deletions(-) diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt index c6effdc4..0ce2dc8e 100644 --- a/ext/CMakeLists.txt +++ b/ext/CMakeLists.txt @@ -1,6 +1,5 @@ if (RC_ENABLE_TESTS OR RC_ENABLE_CATCH) - add_library(catch INTERFACE) - target_include_directories(catch INTERFACE catch/include) + add_subdirectory(catch) endif() if ((RC_ENABLE_GMOCK OR RC_ENABLE_GTEST) AND RC_ENABLE_TESTS) diff --git a/ext/catch b/ext/catch index 2ce6c74f..03d122a3 160000 --- a/ext/catch +++ b/ext/catch @@ -1 +1 @@ -Subproject commit 2ce6c74f8fcbd28c977e70d8c020939123a9ea3c +Subproject commit 03d122a35c3f5c398c43095a87bc82ed44642516 diff --git a/extras/boost/test/CMakeLists.txt b/extras/boost/test/CMakeLists.txt index 1ceb77ae..0a186e83 100644 --- a/extras/boost/test/CMakeLists.txt +++ b/extras/boost/test/CMakeLists.txt @@ -8,8 +8,8 @@ target_link_libraries(rapidcheck_boost_tests rapidcheck_boost rapidcheck_catch rapidcheck_test_utils - catch) + Catch2::Catch2) add_test( NAME rapidcheck_boost_tests - COMMAND rapidcheck_boost_tests) \ No newline at end of file + COMMAND rapidcheck_boost_tests) diff --git a/extras/boost/test/OptionalTests.cpp b/extras/boost/test/OptionalTests.cpp index 24f49559..33f9aa0a 100644 --- a/extras/boost/test/OptionalTests.cpp +++ b/extras/boost/test/OptionalTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/extras/boost/test/main.cpp b/extras/boost/test/main.cpp index cd8c0b64..2c8e8565 100644 --- a/extras/boost/test/main.cpp +++ b/extras/boost/test/main.cpp @@ -12,4 +12,4 @@ inline bool uncaught_exception() noexcept(true) { #endif #define CATCH_CONFIG_MAIN -#include +#include diff --git a/extras/catch/include/rapidcheck/catch.h b/extras/catch/include/rapidcheck/catch.h index 75bb077e..5b3aea10 100644 --- a/extras/catch/include/rapidcheck/catch.h +++ b/extras/catch/include/rapidcheck/catch.h @@ -3,11 +3,11 @@ #include #include -#include +#include namespace rc { -/// For use with `catch.hpp`. Use this function wherever you would use a +/// For use with `catch2/catch.hpp`. Use this function wherever you would use a /// `SECTION` for convenient checking of properties. /// /// @param description A description of the property. diff --git a/extras/gmock/test/CMakeLists.txt b/extras/gmock/test/CMakeLists.txt index d5eed9b1..7e91d403 100644 --- a/extras/gmock/test/CMakeLists.txt +++ b/extras/gmock/test/CMakeLists.txt @@ -2,7 +2,7 @@ add_executable(rapidcheck_gmock_tests main.cpp) target_link_libraries(rapidcheck_gmock_tests rapidcheck_gmock rapidcheck_catch - catch + Catch2::Catch2 gmock) target_include_directories(rapidcheck_gmock_tests PRIVATE ${CMAKE_SOURCE_DIR}/ext/googletest/googletest/include diff --git a/extras/gmock/test/main.cpp b/extras/gmock/test/main.cpp index a4ad9c36..2bb5b309 100644 --- a/extras/gmock/test/main.cpp +++ b/extras/gmock/test/main.cpp @@ -1,5 +1,5 @@ #define CATCH_CONFIG_RUNNER -#include +#include #include #include #include diff --git a/test/AssertionsTests.cpp b/test/AssertionsTests.cpp index 2f808920..7c6c2160 100644 --- a/test/AssertionsTests.cpp +++ b/test/AssertionsTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index f27c275a..77165a6e 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -82,7 +82,7 @@ add_executable(rapidcheck_tests target_link_libraries(rapidcheck_tests rapidcheck - catch + Catch2::Catch2 rapidcheck_catch rapidcheck_test_utils) target_include_directories(rapidcheck_tests PRIVATE diff --git a/test/CheckTests.cpp b/test/CheckTests.cpp index 21a85e4d..9fac5cf6 100644 --- a/test/CheckTests.cpp +++ b/test/CheckTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "rapidcheck/detail/TestListenerAdapter.h" diff --git a/test/ClassifyTests.cpp b/test/ClassifyTests.cpp index 7050d058..4d7a5e2f 100644 --- a/test/ClassifyTests.cpp +++ b/test/ClassifyTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include using namespace rc; diff --git a/test/GenTests.cpp b/test/GenTests.cpp index a0fbf6d1..937a3824 100644 --- a/test/GenTests.cpp +++ b/test/GenTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "rapidcheck/Gen.h" diff --git a/test/LogTests.cpp b/test/LogTests.cpp index 5f1ca0ac..be75f740 100644 --- a/test/LogTests.cpp +++ b/test/LogTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include using namespace rc; diff --git a/test/MaybeTests.cpp b/test/MaybeTests.cpp index 92fdc816..aee16d14 100644 --- a/test/MaybeTests.cpp +++ b/test/MaybeTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "rapidcheck/Maybe.h" diff --git a/test/RandomTests.cpp b/test/RandomTests.cpp index caf9fb5b..0899eef5 100644 --- a/test/RandomTests.cpp +++ b/test/RandomTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/test/SeqTests.cpp b/test/SeqTests.cpp index a779a997..f88b0904 100644 --- a/test/SeqTests.cpp +++ b/test/SeqTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "rapidcheck/Seq.h" diff --git a/test/ShowTests.cpp b/test/ShowTests.cpp index 546351f5..b8efb60e 100644 --- a/test/ShowTests.cpp +++ b/test/ShowTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "util/Box.h" diff --git a/test/ShrinkableTests.cpp b/test/ShrinkableTests.cpp index 18840a1f..f78bc9b4 100644 --- a/test/ShrinkableTests.cpp +++ b/test/ShrinkableTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "rapidcheck/Shrinkable.h" diff --git a/test/detail/AnyTests.cpp b/test/detail/AnyTests.cpp index e14e4b0a..347faa81 100644 --- a/test/detail/AnyTests.cpp +++ b/test/detail/AnyTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include "rapidcheck/detail/Any.h" diff --git a/test/detail/ApplyTupleTests.cpp b/test/detail/ApplyTupleTests.cpp index c4c98bf9..85ca97c3 100644 --- a/test/detail/ApplyTupleTests.cpp +++ b/test/detail/ApplyTupleTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "rapidcheck/detail/ApplyTuple.h" diff --git a/test/detail/Base64Tests.cpp b/test/detail/Base64Tests.cpp index 11697f10..93962c5b 100644 --- a/test/detail/Base64Tests.cpp +++ b/test/detail/Base64Tests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "detail/Base64.h" diff --git a/test/detail/BitStreamTests.cpp b/test/detail/BitStreamTests.cpp index 95085ac8..15ab3408 100644 --- a/test/detail/BitStreamTests.cpp +++ b/test/detail/BitStreamTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/test/detail/CaptureTests.cpp b/test/detail/CaptureTests.cpp index d9a7b97f..a7de436d 100644 --- a/test/detail/CaptureTests.cpp +++ b/test/detail/CaptureTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "rapidcheck/detail/Capture.h" diff --git a/test/detail/ConfigurationTests.cpp b/test/detail/ConfigurationTests.cpp index 92582c58..3218afff 100644 --- a/test/detail/ConfigurationTests.cpp +++ b/test/detail/ConfigurationTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "util/TemplateProps.h" diff --git a/test/detail/DefaultTestListenerTests.cpp b/test/detail/DefaultTestListenerTests.cpp index 02fae3ac..03c35410 100644 --- a/test/detail/DefaultTestListenerTests.cpp +++ b/test/detail/DefaultTestListenerTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include "detail/DefaultTestListener.h" diff --git a/test/detail/FrequencyMapTests.cpp b/test/detail/FrequencyMapTests.cpp index 287bf1e9..fa33ce49 100644 --- a/test/detail/FrequencyMapTests.cpp +++ b/test/detail/FrequencyMapTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/test/detail/ImplicitParamTests.cpp b/test/detail/ImplicitParamTests.cpp index 86348a18..53bc2519 100644 --- a/test/detail/ImplicitParamTests.cpp +++ b/test/detail/ImplicitParamTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/test/detail/LogTestListenerTests.cpp b/test/detail/LogTestListenerTests.cpp index e5ee3f9a..8d3351bf 100644 --- a/test/detail/LogTestListenerTests.cpp +++ b/test/detail/LogTestListenerTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include "detail/LogTestListener.h" diff --git a/test/detail/MapParserTests.cpp b/test/detail/MapParserTests.cpp index bda711da..f2657e69 100644 --- a/test/detail/MapParserTests.cpp +++ b/test/detail/MapParserTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "detail/MapParser.h" diff --git a/test/detail/MulticastTestListenerTests.cpp b/test/detail/MulticastTestListenerTests.cpp index 5b0aebe9..c9d32cbf 100644 --- a/test/detail/MulticastTestListenerTests.cpp +++ b/test/detail/MulticastTestListenerTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "detail/MulticastTestListener.h" diff --git a/test/detail/PropertyTests.cpp b/test/detail/PropertyTests.cpp index 052bd39e..9af8a27e 100644 --- a/test/detail/PropertyTests.cpp +++ b/test/detail/PropertyTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "rapidcheck/detail/Property.h" diff --git a/test/detail/ReproduceListenerTests.cpp b/test/detail/ReproduceListenerTests.cpp index d4aac8c0..cf797baa 100644 --- a/test/detail/ReproduceListenerTests.cpp +++ b/test/detail/ReproduceListenerTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "detail/ReproduceListener.h" diff --git a/test/detail/ResultsTests.cpp b/test/detail/ResultsTests.cpp index 07e0dc72..f91ce797 100644 --- a/test/detail/ResultsTests.cpp +++ b/test/detail/ResultsTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/test/detail/SerializationTests/CompactIntegers.cpp b/test/detail/SerializationTests/CompactIntegers.cpp index 4bf74761..20435f88 100644 --- a/test/detail/SerializationTests/CompactIntegers.cpp +++ b/test/detail/SerializationTests/CompactIntegers.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "rapidcheck/detail/Serialization.h" diff --git a/test/detail/SerializationTests/CompactRanges.cpp b/test/detail/SerializationTests/CompactRanges.cpp index f5d54af0..999fbe3f 100644 --- a/test/detail/SerializationTests/CompactRanges.cpp +++ b/test/detail/SerializationTests/CompactRanges.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "rapidcheck/detail/Serialization.h" diff --git a/test/detail/SerializationTests/Integers.cpp b/test/detail/SerializationTests/Integers.cpp index af4b2aa0..880bcc3f 100644 --- a/test/detail/SerializationTests/Integers.cpp +++ b/test/detail/SerializationTests/Integers.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "rapidcheck/detail/Serialization.h" diff --git a/test/detail/SerializationTests/Misc.cpp b/test/detail/SerializationTests/Misc.cpp index fe58540a..a7802716 100644 --- a/test/detail/SerializationTests/Misc.cpp +++ b/test/detail/SerializationTests/Misc.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "rapidcheck/detail/Serialization.h" diff --git a/test/detail/ShowTypeTests.cpp b/test/detail/ShowTypeTests.cpp index 999da223..c678f596 100644 --- a/test/detail/ShowTypeTests.cpp +++ b/test/detail/ShowTypeTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include "rapidcheck/detail/ShowType.h" diff --git a/test/detail/StringSerializationTests.cpp b/test/detail/StringSerializationTests.cpp index 57fed560..fa23ae3c 100644 --- a/test/detail/StringSerializationTests.cpp +++ b/test/detail/StringSerializationTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "detail/StringSerialization.h" diff --git a/test/detail/TestMetadataTests.cpp b/test/detail/TestMetadataTests.cpp index f619ee87..439f6d12 100644 --- a/test/detail/TestMetadataTests.cpp +++ b/test/detail/TestMetadataTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "rapidcheck/detail/TestMetadata.h" diff --git a/test/detail/TestParamsTests.cpp b/test/detail/TestParamsTests.cpp index fab7d8b3..b52eacd3 100644 --- a/test/detail/TestParamsTests.cpp +++ b/test/detail/TestParamsTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "rapidcheck/detail/Configuration.h" diff --git a/test/detail/TestingTests.cpp b/test/detail/TestingTests.cpp index 5df475b5..2c4067ad 100644 --- a/test/detail/TestingTests.cpp +++ b/test/detail/TestingTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/test/detail/VariantTests.cpp b/test/detail/VariantTests.cpp index 003f5d39..5dbbbc4c 100644 --- a/test/detail/VariantTests.cpp +++ b/test/detail/VariantTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include "util/Util.h" #include "util/Logger.h" diff --git a/test/fn/CommonTests.cpp b/test/fn/CommonTests.cpp index 8192fa30..0a3c8508 100644 --- a/test/fn/CommonTests.cpp +++ b/test/fn/CommonTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "rapidcheck/fn/Common.h" diff --git a/test/gen/BuildTests.cpp b/test/gen/BuildTests.cpp index da5fa5c1..e2e8a3c5 100644 --- a/test/gen/BuildTests.cpp +++ b/test/gen/BuildTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "util/GenUtils.h" diff --git a/test/gen/ChronoTests.cpp b/test/gen/ChronoTests.cpp index 978a0944..b8689706 100644 --- a/test/gen/ChronoTests.cpp +++ b/test/gen/ChronoTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "rapidcheck/gen/Chrono.h" diff --git a/test/gen/ContainerTests/Fixed.cpp b/test/gen/ContainerTests/Fixed.cpp index f9cc8e84..a642667c 100644 --- a/test/gen/ContainerTests/Fixed.cpp +++ b/test/gen/ContainerTests/Fixed.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "Common.h" diff --git a/test/gen/ContainerTests/NonFixed.cpp b/test/gen/ContainerTests/NonFixed.cpp index d13e8aea..3c6b6c7d 100644 --- a/test/gen/ContainerTests/NonFixed.cpp +++ b/test/gen/ContainerTests/NonFixed.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "util/Predictable.h" diff --git a/test/gen/ContainerTests/Unique.cpp b/test/gen/ContainerTests/Unique.cpp index 47303b2c..c62df7f1 100644 --- a/test/gen/ContainerTests/Unique.cpp +++ b/test/gen/ContainerTests/Unique.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "Common.h" diff --git a/test/gen/CreateTests.cpp b/test/gen/CreateTests.cpp index c624b559..29a89011 100644 --- a/test/gen/CreateTests.cpp +++ b/test/gen/CreateTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "rapidcheck/gen/Create.h" diff --git a/test/gen/ExecTests.cpp b/test/gen/ExecTests.cpp index 161d4e1b..eed08c53 100644 --- a/test/gen/ExecTests.cpp +++ b/test/gen/ExecTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "rapidcheck/gen/Exec.h" diff --git a/test/gen/MaybeTests.cpp b/test/gen/MaybeTests.cpp index 6342aef7..2989e887 100644 --- a/test/gen/MaybeTests.cpp +++ b/test/gen/MaybeTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "util/GenUtils.h" diff --git a/test/gen/NumericTests.cpp b/test/gen/NumericTests.cpp index 3ef3c185..1a003bb7 100644 --- a/test/gen/NumericTests.cpp +++ b/test/gen/NumericTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/test/gen/PredicateTests.cpp b/test/gen/PredicateTests.cpp index 92ea8323..a1b4abe8 100644 --- a/test/gen/PredicateTests.cpp +++ b/test/gen/PredicateTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "util/GenUtils.h" diff --git a/test/gen/SelectTests.cpp b/test/gen/SelectTests.cpp index fab1acf9..166be1a7 100644 --- a/test/gen/SelectTests.cpp +++ b/test/gen/SelectTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "rapidcheck/gen/Create.h" diff --git a/test/gen/TextTests.cpp b/test/gen/TextTests.cpp index 72fa4cf9..4364f168 100644 --- a/test/gen/TextTests.cpp +++ b/test/gen/TextTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "rapidcheck/gen/Text.h" diff --git a/test/gen/TransformTests.cpp b/test/gen/TransformTests.cpp index 5e31a3f3..e8116785 100644 --- a/test/gen/TransformTests.cpp +++ b/test/gen/TransformTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "rapidcheck/gen/Transform.h" diff --git a/test/gen/TupleTests.cpp b/test/gen/TupleTests.cpp index c0c0af6f..22d0b690 100644 --- a/test/gen/TupleTests.cpp +++ b/test/gen/TupleTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "util/ArbitraryRandom.h" diff --git a/test/gen/detail/ExecRawTests.cpp b/test/gen/detail/ExecRawTests.cpp index 5d0f6cc1..6339876f 100644 --- a/test/gen/detail/ExecRawTests.cpp +++ b/test/gen/detail/ExecRawTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/test/gen/detail/RecipeTests.cpp b/test/gen/detail/RecipeTests.cpp index 06cc06e4..1e8b46a6 100644 --- a/test/gen/detail/RecipeTests.cpp +++ b/test/gen/detail/RecipeTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "rapidcheck/gen/detail/Recipe.h" diff --git a/test/gen/detail/ScaleIntegerTests.cpp b/test/gen/detail/ScaleIntegerTests.cpp index 1c5f8205..e6360d03 100644 --- a/test/gen/detail/ScaleIntegerTests.cpp +++ b/test/gen/detail/ScaleIntegerTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include using namespace rc; diff --git a/test/gen/detail/ShrinkValueIteratorTests.cpp b/test/gen/detail/ShrinkValueIteratorTests.cpp index e5a4de1e..7721afdb 100644 --- a/test/gen/detail/ShrinkValueIteratorTests.cpp +++ b/test/gen/detail/ShrinkValueIteratorTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/test/main.cpp b/test/main.cpp index f39dc980..f775c083 100644 --- a/test/main.cpp +++ b/test/main.cpp @@ -12,4 +12,4 @@ inline bool uncaught_exception() noexcept(true) { #endif #define CATCH_CONFIG_MAIN -#include +#include diff --git a/test/seq/CreateTests.cpp b/test/seq/CreateTests.cpp index 53e0543e..b87b11ac 100644 --- a/test/seq/CreateTests.cpp +++ b/test/seq/CreateTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "rapidcheck/seq/Create.h" diff --git a/test/seq/OperationsTests.cpp b/test/seq/OperationsTests.cpp index 926914bf..68dc5ec0 100644 --- a/test/seq/OperationsTests.cpp +++ b/test/seq/OperationsTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/test/seq/SeqIteratorTests.cpp b/test/seq/SeqIteratorTests.cpp index 31cf1131..0196d1ad 100644 --- a/test/seq/SeqIteratorTests.cpp +++ b/test/seq/SeqIteratorTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "util/Generators.h" diff --git a/test/seq/TransformTests.cpp b/test/seq/TransformTests.cpp index 2e26583d..0bf197e2 100644 --- a/test/seq/TransformTests.cpp +++ b/test/seq/TransformTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "rapidcheck/seq/Transform.h" diff --git a/test/shrink/ShrinkTests.cpp b/test/shrink/ShrinkTests.cpp index c075c50c..6889deed 100644 --- a/test/shrink/ShrinkTests.cpp +++ b/test/shrink/ShrinkTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/test/shrinkable/CreateTests.cpp b/test/shrinkable/CreateTests.cpp index e3e17e9c..917a7de2 100644 --- a/test/shrinkable/CreateTests.cpp +++ b/test/shrinkable/CreateTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "rapidcheck/shrinkable/Create.h" diff --git a/test/shrinkable/OperationsTests.cpp b/test/shrinkable/OperationsTests.cpp index 545a527a..633ca2b7 100644 --- a/test/shrinkable/OperationsTests.cpp +++ b/test/shrinkable/OperationsTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "rapidcheck/shrinkable/Operations.h" diff --git a/test/shrinkable/TransformTests.cpp b/test/shrinkable/TransformTests.cpp index 4483f504..e3403ce5 100644 --- a/test/shrinkable/TransformTests.cpp +++ b/test/shrinkable/TransformTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include "rapidcheck/shrinkable/Transform.h" diff --git a/test/state/CommandTests.cpp b/test/state/CommandTests.cpp index 7f94a931..76281f79 100644 --- a/test/state/CommandTests.cpp +++ b/test/state/CommandTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/test/state/CommandsTests.cpp b/test/state/CommandsTests.cpp index 07efb058..73005de7 100644 --- a/test/state/CommandsTests.cpp +++ b/test/state/CommandsTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/test/state/IntegrationTests.cpp b/test/state/IntegrationTests.cpp index 00e919cb..44893b29 100644 --- a/test/state/IntegrationTests.cpp +++ b/test/state/IntegrationTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/test/state/StateTests.cpp b/test/state/StateTests.cpp index edd1781a..5f97f2b9 100644 --- a/test/state/StateTests.cpp +++ b/test/state/StateTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/test/state/gen/CommandsTests.cpp b/test/state/gen/CommandsTests.cpp index d85a1c39..3efff340 100644 --- a/test/state/gen/CommandsTests.cpp +++ b/test/state/gen/CommandsTests.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include diff --git a/test/util/Logger.h b/test/util/Logger.h index 70b48e63..bd4ab821 100644 --- a/test/util/Logger.h +++ b/test/util/Logger.h @@ -1,6 +1,6 @@ #pragma once -#include +#include #include From 986304abcf1f680d2ed7ad5aef43fa0ccdb1bda9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Sat, 17 Nov 2018 23:51:39 +0100 Subject: [PATCH 2/2] Enable catch tests on AppVeyor --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 345408cd..0ebcb295 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -23,8 +23,8 @@ build_script: - md build - cd build - "\"C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\vcvarsall.bat\" %ARCH%" -- cmake -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -DRC_ENABLE_TESTS=ON -DRC_ENABLE_EXAMPLES=ON -DRC_ENABLE_GTEST=ON -DRC_ENABLE_GMOCK=ON -DRC_ENABLE_BOOST=ON -DRC_ENABLE_BOOST_TEST=ON -G "NMake Makefiles" .. +- cmake -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -DRC_ENABLE_TESTS=ON -DRC_ENABLE_EXAMPLES=ON -DRC_ENABLE_GTEST=ON -DRC_ENABLE_GMOCK=ON -DRC_ENABLE_BOOST=ON -DRC_ENABLE_BOOST_TEST=ON -DRC_ENABLE_CATCH=on -G "NMake Makefiles" .. - nmake test_script: -- ctest --output-on-failure \ No newline at end of file +- ctest --output-on-failure