From f108b5d8be2905d24ce412d217eeaf24e8c2e40c Mon Sep 17 00:00:00 2001 From: Patrick Jackson Date: Sat, 20 Apr 2019 08:39:29 -0700 Subject: [PATCH 1/2] Adding separate compilation object for Catch main. --- exercises/acronym/CMakeLists.txt | 2 +- exercises/acronym/acronym_test.cpp | 1 - exercises/acronym/test/tests-main.cpp | 2 ++ exercises/all-your-base/CMakeLists.txt | 2 +- exercises/all-your-base/all_your_base_test.cpp | 1 - exercises/all-your-base/test/tests-main.cpp | 2 ++ exercises/allergies/CMakeLists.txt | 2 +- exercises/allergies/allergies_test.cpp | 1 - exercises/allergies/test/tests-main.cpp | 2 ++ exercises/anagram/CMakeLists.txt | 2 +- exercises/anagram/anagram_test.cpp | 1 - exercises/anagram/test/tests-main.cpp | 2 ++ exercises/atbash-cipher/CMakeLists.txt | 2 +- exercises/atbash-cipher/atbash_cipher_test.cpp | 1 - exercises/atbash-cipher/test/tests-main.cpp | 2 ++ exercises/beer-song/CMakeLists.txt | 2 +- exercises/beer-song/beer_song_test.cpp | 1 - exercises/beer-song/test/tests-main.cpp | 2 ++ exercises/binary-search-tree/CMakeLists.txt | 2 +- exercises/binary-search-tree/binary_search_tree_test.cpp | 1 - exercises/binary-search-tree/test/tests-main.cpp | 2 ++ exercises/binary-search/CMakeLists.txt | 2 +- exercises/binary-search/binary_search_test.cpp | 1 - exercises/binary-search/test/tests-main.cpp | 2 ++ exercises/binary/CMakeLists.txt | 2 +- exercises/binary/binary_test.cpp | 1 - exercises/binary/test/tests-main.cpp | 2 ++ exercises/bob/CMakeLists.txt | 2 +- exercises/bob/bob_test.cpp | 1 - exercises/bob/test/tests-main.cpp | 2 ++ exercises/bracket-push/CMakeLists.txt | 2 +- exercises/bracket-push/bracket_push_test.cpp | 1 - exercises/bracket-push/test/tests-main.cpp | 2 ++ exercises/clock/CMakeLists.txt | 2 +- exercises/clock/clock_test.cpp | 1 - exercises/clock/test/tests-main.cpp | 2 ++ exercises/crypto-square/CMakeLists.txt | 2 +- exercises/crypto-square/crypto_square_test.cpp | 1 - exercises/crypto-square/test/tests-main.cpp | 2 ++ exercises/difference-of-squares/CMakeLists.txt | 2 +- exercises/difference-of-squares/difference_of_squares_test.cpp | 1 - exercises/difference-of-squares/test/tests-main.cpp | 2 ++ exercises/etl/CMakeLists.txt | 2 +- exercises/etl/etl_test.cpp | 1 - exercises/etl/test/tests-main.cpp | 2 ++ exercises/food-chain/CMakeLists.txt | 2 +- exercises/food-chain/food_chain_test.cpp | 1 - exercises/food-chain/test/tests-main.cpp | 2 ++ exercises/gigasecond/CMakeLists.txt | 2 +- exercises/gigasecond/gigasecond_test.cpp | 1 - exercises/gigasecond/test/tests-main.cpp | 2 ++ exercises/grade-school/CMakeLists.txt | 2 +- exercises/grade-school/grade_school_test.cpp | 1 - exercises/grade-school/test/tests-main.cpp | 2 ++ exercises/grains/CMakeLists.txt | 2 +- exercises/grains/grains_test.cpp | 1 - exercises/grains/test/tests-main.cpp | 2 ++ exercises/hamming/CMakeLists.txt | 2 +- exercises/hamming/hamming_test.cpp | 1 - exercises/hamming/test/tests-main.cpp | 2 ++ exercises/hello-world/CMakeLists.txt | 2 +- exercises/hello-world/hello_world_test.cpp | 1 - exercises/hello-world/test/tests-main.cpp | 2 ++ exercises/hexadecimal/CMakeLists.txt | 2 +- exercises/hexadecimal/hexadecimal_test.cpp | 1 - exercises/hexadecimal/test/tests-main.cpp | 2 ++ exercises/isogram/CMakeLists.txt | 2 +- exercises/isogram/isogram_test.cpp | 1 - exercises/isogram/test/tests-main.cpp | 2 ++ exercises/leap/CMakeLists.txt | 2 +- exercises/leap/leap_test.cpp | 1 - exercises/leap/test/tests-main.cpp | 2 ++ exercises/luhn/CMakeLists.txt | 2 +- exercises/luhn/luhn_test.cpp | 1 - exercises/luhn/test/tests-main.cpp | 2 ++ exercises/meetup/CMakeLists.txt | 2 +- exercises/meetup/meetup_test.cpp | 1 - exercises/meetup/test/tests-main.cpp | 2 ++ exercises/nth-prime/CMakeLists.txt | 2 +- exercises/nth-prime/nth_prime_test.cpp | 1 - exercises/nth-prime/test/tests-main.cpp | 2 ++ exercises/nucleotide-count/CMakeLists.txt | 2 +- exercises/nucleotide-count/nucleotide_count_test.cpp | 1 - exercises/nucleotide-count/test/tests-main.cpp | 2 ++ exercises/pangram/CMakeLists.txt | 2 +- exercises/pangram/pangram_test.cpp | 1 - exercises/pangram/test/tests-main.cpp | 2 ++ exercises/pascals-triangle/CMakeLists.txt | 2 +- exercises/pascals-triangle/pascals_triangle_test.cpp | 1 - exercises/pascals-triangle/test/tests-main.cpp | 2 ++ exercises/phone-number/CMakeLists.txt | 2 +- exercises/phone-number/phone_number_test.cpp | 1 - exercises/phone-number/test/tests-main.cpp | 2 ++ exercises/prime-factors/CMakeLists.txt | 2 +- exercises/prime-factors/prime_factors_test.cpp | 1 - exercises/prime-factors/test/tests-main.cpp | 2 ++ exercises/queen-attack/CMakeLists.txt | 2 +- exercises/queen-attack/queen_attack_test.cpp | 1 - exercises/queen-attack/test/tests-main.cpp | 2 ++ exercises/raindrops/CMakeLists.txt | 2 +- exercises/raindrops/raindrops_test.cpp | 1 - exercises/raindrops/test/tests-main.cpp | 2 ++ exercises/reverse-string/CMakeLists.txt | 2 +- exercises/reverse-string/reverse_string_test.cpp | 1 - exercises/reverse-string/test/tests-main.cpp | 2 ++ exercises/rna-transcription/CMakeLists.txt | 2 +- exercises/rna-transcription/rna_transcription_test.cpp | 1 - exercises/rna-transcription/test/tests-main.cpp | 2 ++ exercises/robot-name/CMakeLists.txt | 2 +- exercises/robot-name/robot_name_test.cpp | 1 - exercises/robot-name/test/tests-main.cpp | 2 ++ exercises/robot-simulator/CMakeLists.txt | 2 +- exercises/robot-simulator/robot_simulator_test.cpp | 1 - exercises/robot-simulator/test/tests-main.cpp | 2 ++ exercises/roman-numerals/CMakeLists.txt | 2 +- exercises/roman-numerals/roman_numerals_test.cpp | 1 - exercises/roman-numerals/test/tests-main.cpp | 2 ++ exercises/say/CMakeLists.txt | 2 +- exercises/say/say_test.cpp | 1 - exercises/say/test/tests-main.cpp | 2 ++ exercises/scrabble-score/CMakeLists.txt | 2 +- exercises/scrabble-score/scrabble_score_test.cpp | 1 - exercises/scrabble-score/test/tests-main.cpp | 2 ++ exercises/series/CMakeLists.txt | 2 +- exercises/series/series_test.cpp | 1 - exercises/series/test/tests-main.cpp | 2 ++ exercises/sieve/CMakeLists.txt | 2 +- exercises/sieve/sieve_test.cpp | 1 - exercises/sieve/test/tests-main.cpp | 2 ++ exercises/space-age/CMakeLists.txt | 2 +- exercises/space-age/space_age_test.cpp | 1 - exercises/space-age/test/tests-main.cpp | 2 ++ exercises/sum-of-multiples/CMakeLists.txt | 2 +- exercises/sum-of-multiples/sum_of_multiples_test.cpp | 1 - exercises/sum-of-multiples/test/tests-main.cpp | 2 ++ exercises/triangle/CMakeLists.txt | 2 +- exercises/triangle/test/tests-main.cpp | 2 ++ exercises/triangle/triangle_test.cpp | 1 - exercises/trinary/CMakeLists.txt | 2 +- exercises/trinary/test/tests-main.cpp | 2 ++ exercises/trinary/trinary_test.cpp | 1 - exercises/word-count/CMakeLists.txt | 2 +- exercises/word-count/test/tests-main.cpp | 2 ++ exercises/word-count/word_count_test.cpp | 1 - 144 files changed, 144 insertions(+), 96 deletions(-) create mode 100644 exercises/acronym/test/tests-main.cpp create mode 100644 exercises/all-your-base/test/tests-main.cpp create mode 100644 exercises/allergies/test/tests-main.cpp create mode 100644 exercises/anagram/test/tests-main.cpp create mode 100644 exercises/atbash-cipher/test/tests-main.cpp create mode 100644 exercises/beer-song/test/tests-main.cpp create mode 100644 exercises/binary-search-tree/test/tests-main.cpp create mode 100644 exercises/binary-search/test/tests-main.cpp create mode 100644 exercises/binary/test/tests-main.cpp create mode 100644 exercises/bob/test/tests-main.cpp create mode 100644 exercises/bracket-push/test/tests-main.cpp create mode 100644 exercises/clock/test/tests-main.cpp create mode 100644 exercises/crypto-square/test/tests-main.cpp create mode 100644 exercises/difference-of-squares/test/tests-main.cpp create mode 100644 exercises/etl/test/tests-main.cpp create mode 100644 exercises/food-chain/test/tests-main.cpp create mode 100644 exercises/gigasecond/test/tests-main.cpp create mode 100644 exercises/grade-school/test/tests-main.cpp create mode 100644 exercises/grains/test/tests-main.cpp create mode 100644 exercises/hamming/test/tests-main.cpp create mode 100644 exercises/hello-world/test/tests-main.cpp create mode 100644 exercises/hexadecimal/test/tests-main.cpp create mode 100644 exercises/isogram/test/tests-main.cpp create mode 100644 exercises/leap/test/tests-main.cpp create mode 100644 exercises/luhn/test/tests-main.cpp create mode 100644 exercises/meetup/test/tests-main.cpp create mode 100644 exercises/nth-prime/test/tests-main.cpp create mode 100644 exercises/nucleotide-count/test/tests-main.cpp create mode 100644 exercises/pangram/test/tests-main.cpp create mode 100644 exercises/pascals-triangle/test/tests-main.cpp create mode 100644 exercises/phone-number/test/tests-main.cpp create mode 100644 exercises/prime-factors/test/tests-main.cpp create mode 100644 exercises/queen-attack/test/tests-main.cpp create mode 100644 exercises/raindrops/test/tests-main.cpp create mode 100644 exercises/reverse-string/test/tests-main.cpp create mode 100644 exercises/rna-transcription/test/tests-main.cpp create mode 100644 exercises/robot-name/test/tests-main.cpp create mode 100644 exercises/robot-simulator/test/tests-main.cpp create mode 100644 exercises/roman-numerals/test/tests-main.cpp create mode 100644 exercises/say/test/tests-main.cpp create mode 100644 exercises/scrabble-score/test/tests-main.cpp create mode 100644 exercises/series/test/tests-main.cpp create mode 100644 exercises/sieve/test/tests-main.cpp create mode 100644 exercises/space-age/test/tests-main.cpp create mode 100644 exercises/sum-of-multiples/test/tests-main.cpp create mode 100644 exercises/triangle/test/tests-main.cpp create mode 100644 exercises/trinary/test/tests-main.cpp create mode 100644 exercises/word-count/test/tests-main.cpp diff --git a/exercises/acronym/CMakeLists.txt b/exercises/acronym/CMakeLists.txt index b81b3564..82e6d503 100644 --- a/exercises/acronym/CMakeLists.txt +++ b/exercises/acronym/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/acronym/acronym_test.cpp b/exercises/acronym/acronym_test.cpp index 44f18c5d..5321728c 100644 --- a/exercises/acronym/acronym_test.cpp +++ b/exercises/acronym/acronym_test.cpp @@ -1,5 +1,4 @@ #include "acronym.h" -#define CATCH_CONFIG_MAIN #include "test/catch.hpp" using namespace std; diff --git a/exercises/acronym/test/tests-main.cpp b/exercises/acronym/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/acronym/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/all-your-base/CMakeLists.txt b/exercises/all-your-base/CMakeLists.txt index b81b3564..82e6d503 100644 --- a/exercises/all-your-base/CMakeLists.txt +++ b/exercises/all-your-base/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/all-your-base/all_your_base_test.cpp b/exercises/all-your-base/all_your_base_test.cpp index df6cde0b..d63ecc40 100644 --- a/exercises/all-your-base/all_your_base_test.cpp +++ b/exercises/all-your-base/all_your_base_test.cpp @@ -1,5 +1,4 @@ #include "all_your_base.h" -#define CATCH_CONFIG_MAIN #include "test/catch.hpp" using namespace std; diff --git a/exercises/all-your-base/test/tests-main.cpp b/exercises/all-your-base/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/all-your-base/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/allergies/CMakeLists.txt b/exercises/allergies/CMakeLists.txt index b81b3564..82e6d503 100644 --- a/exercises/allergies/CMakeLists.txt +++ b/exercises/allergies/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/allergies/allergies_test.cpp b/exercises/allergies/allergies_test.cpp index 5ac57e40..6c4420cf 100644 --- a/exercises/allergies/allergies_test.cpp +++ b/exercises/allergies/allergies_test.cpp @@ -1,5 +1,4 @@ #include "allergies.h" -#define CATCH_CONFIG_MAIN #include "test/catch.hpp" #include diff --git a/exercises/allergies/test/tests-main.cpp b/exercises/allergies/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/allergies/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/anagram/CMakeLists.txt b/exercises/anagram/CMakeLists.txt index b81b3564..82e6d503 100644 --- a/exercises/anagram/CMakeLists.txt +++ b/exercises/anagram/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/anagram/anagram_test.cpp b/exercises/anagram/anagram_test.cpp index 6a2975a2..14471517 100644 --- a/exercises/anagram/anagram_test.cpp +++ b/exercises/anagram/anagram_test.cpp @@ -1,5 +1,4 @@ #include "anagram.h" -#define CATCH_CONFIG_MAIN #include "test/catch.hpp" using namespace std; diff --git a/exercises/anagram/test/tests-main.cpp b/exercises/anagram/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/anagram/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/atbash-cipher/CMakeLists.txt b/exercises/atbash-cipher/CMakeLists.txt index b81b3564..82e6d503 100644 --- a/exercises/atbash-cipher/CMakeLists.txt +++ b/exercises/atbash-cipher/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/atbash-cipher/atbash_cipher_test.cpp b/exercises/atbash-cipher/atbash_cipher_test.cpp index 82c2e4ce..3d674b7c 100644 --- a/exercises/atbash-cipher/atbash_cipher_test.cpp +++ b/exercises/atbash-cipher/atbash_cipher_test.cpp @@ -1,5 +1,4 @@ #include "atbash_cipher.h" -#define CATCH_CONFIG_MAIN #include "test/catch.hpp" TEST_CASE("encode_yes") diff --git a/exercises/atbash-cipher/test/tests-main.cpp b/exercises/atbash-cipher/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/atbash-cipher/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/beer-song/CMakeLists.txt b/exercises/beer-song/CMakeLists.txt index b81b3564..82e6d503 100644 --- a/exercises/beer-song/CMakeLists.txt +++ b/exercises/beer-song/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/beer-song/beer_song_test.cpp b/exercises/beer-song/beer_song_test.cpp index 731a3fb3..b233849f 100644 --- a/exercises/beer-song/beer_song_test.cpp +++ b/exercises/beer-song/beer_song_test.cpp @@ -1,5 +1,4 @@ #include "beer_song.h" -#define CATCH_CONFIG_MAIN #include "test/catch.hpp" using namespace std; diff --git a/exercises/beer-song/test/tests-main.cpp b/exercises/beer-song/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/beer-song/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/binary-search-tree/CMakeLists.txt b/exercises/binary-search-tree/CMakeLists.txt index b81b3564..82e6d503 100644 --- a/exercises/binary-search-tree/CMakeLists.txt +++ b/exercises/binary-search-tree/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/binary-search-tree/binary_search_tree_test.cpp b/exercises/binary-search-tree/binary_search_tree_test.cpp index 847c5104..4a9f6d95 100644 --- a/exercises/binary-search-tree/binary_search_tree_test.cpp +++ b/exercises/binary-search-tree/binary_search_tree_test.cpp @@ -1,5 +1,4 @@ #include "binary_search_tree.h" -#define CATCH_CONFIG_MAIN #include "test/catch.hpp" #include diff --git a/exercises/binary-search-tree/test/tests-main.cpp b/exercises/binary-search-tree/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/binary-search-tree/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/binary-search/CMakeLists.txt b/exercises/binary-search/CMakeLists.txt index b81b3564..82e6d503 100644 --- a/exercises/binary-search/CMakeLists.txt +++ b/exercises/binary-search/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/binary-search/binary_search_test.cpp b/exercises/binary-search/binary_search_test.cpp index 9036813b..cf839bca 100644 --- a/exercises/binary-search/binary_search_test.cpp +++ b/exercises/binary-search/binary_search_test.cpp @@ -1,5 +1,4 @@ #include "binary_search.h" -#define CATCH_CONFIG_MAIN #include "test/catch.hpp" #include #include diff --git a/exercises/binary-search/test/tests-main.cpp b/exercises/binary-search/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/binary-search/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/binary/CMakeLists.txt b/exercises/binary/CMakeLists.txt index b81b3564..82e6d503 100644 --- a/exercises/binary/CMakeLists.txt +++ b/exercises/binary/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/binary/binary_test.cpp b/exercises/binary/binary_test.cpp index 7f24a381..3e41388c 100644 --- a/exercises/binary/binary_test.cpp +++ b/exercises/binary/binary_test.cpp @@ -1,5 +1,4 @@ #include "binary.h" -#define CATCH_CONFIG_MAIN #include "test/catch.hpp" TEST_CASE("b1_is_decimal_1") diff --git a/exercises/binary/test/tests-main.cpp b/exercises/binary/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/binary/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/bob/CMakeLists.txt b/exercises/bob/CMakeLists.txt index b81b3564..82e6d503 100644 --- a/exercises/bob/CMakeLists.txt +++ b/exercises/bob/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/bob/bob_test.cpp b/exercises/bob/bob_test.cpp index 403110b4..9924fe81 100644 --- a/exercises/bob/bob_test.cpp +++ b/exercises/bob/bob_test.cpp @@ -1,5 +1,4 @@ #include "bob.h" -#define CATCH_CONFIG_MAIN #include "test/catch.hpp" TEST_CASE("stating_something") diff --git a/exercises/bob/test/tests-main.cpp b/exercises/bob/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/bob/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/bracket-push/CMakeLists.txt b/exercises/bracket-push/CMakeLists.txt index b81b3564..82e6d503 100644 --- a/exercises/bracket-push/CMakeLists.txt +++ b/exercises/bracket-push/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/bracket-push/bracket_push_test.cpp b/exercises/bracket-push/bracket_push_test.cpp index bc2040c0..f9265abb 100644 --- a/exercises/bracket-push/bracket_push_test.cpp +++ b/exercises/bracket-push/bracket_push_test.cpp @@ -1,5 +1,4 @@ #include "bracket_push.h" -#define CATCH_CONFIG_MAIN #include "test/catch.hpp" TEST_CASE("paired_square_brackets") diff --git a/exercises/bracket-push/test/tests-main.cpp b/exercises/bracket-push/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/bracket-push/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/clock/CMakeLists.txt b/exercises/clock/CMakeLists.txt index b81b3564..82e6d503 100644 --- a/exercises/clock/CMakeLists.txt +++ b/exercises/clock/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/clock/clock_test.cpp b/exercises/clock/clock_test.cpp index 9839d898..3ebc24ba 100644 --- a/exercises/clock/clock_test.cpp +++ b/exercises/clock/clock_test.cpp @@ -1,5 +1,4 @@ #include "clock.h" -#define CATCH_CONFIG_MAIN #include "test/catch.hpp" using namespace std; diff --git a/exercises/clock/test/tests-main.cpp b/exercises/clock/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/clock/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/crypto-square/CMakeLists.txt b/exercises/crypto-square/CMakeLists.txt index b81b3564..82e6d503 100644 --- a/exercises/crypto-square/CMakeLists.txt +++ b/exercises/crypto-square/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/crypto-square/crypto_square_test.cpp b/exercises/crypto-square/crypto_square_test.cpp index 0e1d9deb..ad3686e1 100644 --- a/exercises/crypto-square/crypto_square_test.cpp +++ b/exercises/crypto-square/crypto_square_test.cpp @@ -1,5 +1,4 @@ #include "crypto_square.h" -#define CATCH_CONFIG_MAIN #include "test/catch.hpp" TEST_CASE("normalize_capitals") diff --git a/exercises/crypto-square/test/tests-main.cpp b/exercises/crypto-square/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/crypto-square/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/difference-of-squares/CMakeLists.txt b/exercises/difference-of-squares/CMakeLists.txt index b81b3564..82e6d503 100644 --- a/exercises/difference-of-squares/CMakeLists.txt +++ b/exercises/difference-of-squares/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/difference-of-squares/difference_of_squares_test.cpp b/exercises/difference-of-squares/difference_of_squares_test.cpp index f96b0519..e97ace4b 100644 --- a/exercises/difference-of-squares/difference_of_squares_test.cpp +++ b/exercises/difference-of-squares/difference_of_squares_test.cpp @@ -1,5 +1,4 @@ #include "difference_of_squares.h" -#define CATCH_CONFIG_MAIN #include "test/catch.hpp" TEST_CASE("up_to_5") diff --git a/exercises/difference-of-squares/test/tests-main.cpp b/exercises/difference-of-squares/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/difference-of-squares/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/etl/CMakeLists.txt b/exercises/etl/CMakeLists.txt index b81b3564..82e6d503 100644 --- a/exercises/etl/CMakeLists.txt +++ b/exercises/etl/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/etl/etl_test.cpp b/exercises/etl/etl_test.cpp index 91982c3b..e298097e 100644 --- a/exercises/etl/etl_test.cpp +++ b/exercises/etl/etl_test.cpp @@ -1,5 +1,4 @@ #include "etl.h" -#define CATCH_CONFIG_MAIN #include #include "test/catch.hpp" diff --git a/exercises/etl/test/tests-main.cpp b/exercises/etl/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/etl/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/food-chain/CMakeLists.txt b/exercises/food-chain/CMakeLists.txt index b81b3564..82e6d503 100644 --- a/exercises/food-chain/CMakeLists.txt +++ b/exercises/food-chain/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/food-chain/food_chain_test.cpp b/exercises/food-chain/food_chain_test.cpp index 967a3d61..bc2163ae 100644 --- a/exercises/food-chain/food_chain_test.cpp +++ b/exercises/food-chain/food_chain_test.cpp @@ -1,5 +1,4 @@ #include "food_chain.h" -#define CATCH_CONFIG_MAIN #include "test/catch.hpp" using namespace std; diff --git a/exercises/food-chain/test/tests-main.cpp b/exercises/food-chain/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/food-chain/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/gigasecond/CMakeLists.txt b/exercises/gigasecond/CMakeLists.txt index b080690d..a081426b 100644 --- a/exercises/gigasecond/CMakeLists.txt +++ b/exercises/gigasecond/CMakeLists.txt @@ -24,7 +24,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/gigasecond/gigasecond_test.cpp b/exercises/gigasecond/gigasecond_test.cpp index 76e59579..50e5cb9c 100644 --- a/exercises/gigasecond/gigasecond_test.cpp +++ b/exercises/gigasecond/gigasecond_test.cpp @@ -1,5 +1,4 @@ #include "gigasecond.h" -#define CATCH_CONFIG_MAIN #include "test/catch.hpp" #include "boost/date_time/posix_time/posix_time.hpp" diff --git a/exercises/gigasecond/test/tests-main.cpp b/exercises/gigasecond/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/gigasecond/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/grade-school/CMakeLists.txt b/exercises/grade-school/CMakeLists.txt index b81b3564..82e6d503 100644 --- a/exercises/grade-school/CMakeLists.txt +++ b/exercises/grade-school/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/grade-school/grade_school_test.cpp b/exercises/grade-school/grade_school_test.cpp index e384ceb3..2478bff5 100644 --- a/exercises/grade-school/grade_school_test.cpp +++ b/exercises/grade-school/grade_school_test.cpp @@ -1,5 +1,4 @@ #include "grade_school.h" -#define CATCH_CONFIG_MAIN #include #include "test/catch.hpp" diff --git a/exercises/grade-school/test/tests-main.cpp b/exercises/grade-school/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/grade-school/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/grains/CMakeLists.txt b/exercises/grains/CMakeLists.txt index b81b3564..82e6d503 100644 --- a/exercises/grains/CMakeLists.txt +++ b/exercises/grains/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/grains/grains_test.cpp b/exercises/grains/grains_test.cpp index 9d721872..27c9adbf 100644 --- a/exercises/grains/grains_test.cpp +++ b/exercises/grains/grains_test.cpp @@ -1,5 +1,4 @@ #include "grains.h" -#define CATCH_CONFIG_MAIN #include "test/catch.hpp" TEST_CASE("square_1") diff --git a/exercises/grains/test/tests-main.cpp b/exercises/grains/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/grains/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/hamming/CMakeLists.txt b/exercises/hamming/CMakeLists.txt index b81b3564..82e6d503 100644 --- a/exercises/hamming/CMakeLists.txt +++ b/exercises/hamming/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/hamming/hamming_test.cpp b/exercises/hamming/hamming_test.cpp index db390021..481acdc2 100644 --- a/exercises/hamming/hamming_test.cpp +++ b/exercises/hamming/hamming_test.cpp @@ -1,6 +1,5 @@ #include "hamming.h" #include -#define CATCH_CONFIG_MAIN #include "test/catch.hpp" TEST_CASE("no_difference_between_identical_strands") diff --git a/exercises/hamming/test/tests-main.cpp b/exercises/hamming/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/hamming/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/hello-world/CMakeLists.txt b/exercises/hello-world/CMakeLists.txt index b81b3564..82e6d503 100644 --- a/exercises/hello-world/CMakeLists.txt +++ b/exercises/hello-world/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/hello-world/hello_world_test.cpp b/exercises/hello-world/hello_world_test.cpp index 7120daf1..bee2816c 100644 --- a/exercises/hello-world/hello_world_test.cpp +++ b/exercises/hello-world/hello_world_test.cpp @@ -1,5 +1,4 @@ #include "hello_world.h" -#define CATCH_CONFIG_MAIN #include "test/catch.hpp" TEST_CASE("test_hello") diff --git a/exercises/hello-world/test/tests-main.cpp b/exercises/hello-world/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/hello-world/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/hexadecimal/CMakeLists.txt b/exercises/hexadecimal/CMakeLists.txt index b81b3564..82e6d503 100644 --- a/exercises/hexadecimal/CMakeLists.txt +++ b/exercises/hexadecimal/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/hexadecimal/hexadecimal_test.cpp b/exercises/hexadecimal/hexadecimal_test.cpp index c50502d6..47a0e755 100644 --- a/exercises/hexadecimal/hexadecimal_test.cpp +++ b/exercises/hexadecimal/hexadecimal_test.cpp @@ -1,5 +1,4 @@ #include "hexadecimal.h" -#define CATCH_CONFIG_MAIN #include "test/catch.hpp" TEST_CASE("hex_1_is_decimal_1") diff --git a/exercises/hexadecimal/test/tests-main.cpp b/exercises/hexadecimal/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/hexadecimal/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/isogram/CMakeLists.txt b/exercises/isogram/CMakeLists.txt index b81b3564..82e6d503 100644 --- a/exercises/isogram/CMakeLists.txt +++ b/exercises/isogram/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/isogram/isogram_test.cpp b/exercises/isogram/isogram_test.cpp index b3a9b468..16ca97df 100644 --- a/exercises/isogram/isogram_test.cpp +++ b/exercises/isogram/isogram_test.cpp @@ -1,5 +1,4 @@ #include "isogram.h" -#define CATCH_CONFIG_MAIN #include "test/catch.hpp" using namespace std; diff --git a/exercises/isogram/test/tests-main.cpp b/exercises/isogram/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/isogram/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/leap/CMakeLists.txt b/exercises/leap/CMakeLists.txt index b81b3564..82e6d503 100644 --- a/exercises/leap/CMakeLists.txt +++ b/exercises/leap/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/leap/leap_test.cpp b/exercises/leap/leap_test.cpp index 54d8644f..9c7e4063 100644 --- a/exercises/leap/leap_test.cpp +++ b/exercises/leap/leap_test.cpp @@ -1,5 +1,4 @@ #include "leap.h" -#define CATCH_CONFIG_MAIN #include "test/catch.hpp" TEST_CASE("not_divisible_by_4") diff --git a/exercises/leap/test/tests-main.cpp b/exercises/leap/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/leap/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/luhn/CMakeLists.txt b/exercises/luhn/CMakeLists.txt index b81b3564..82e6d503 100644 --- a/exercises/luhn/CMakeLists.txt +++ b/exercises/luhn/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/luhn/luhn_test.cpp b/exercises/luhn/luhn_test.cpp index 6ca3eda7..421eb11b 100644 --- a/exercises/luhn/luhn_test.cpp +++ b/exercises/luhn/luhn_test.cpp @@ -1,5 +1,4 @@ #include "luhn.h" -#define CATCH_CONFIG_MAIN #include "test/catch.hpp" //Luhn exercise test case data version 1.5.0 diff --git a/exercises/luhn/test/tests-main.cpp b/exercises/luhn/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/luhn/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/meetup/CMakeLists.txt b/exercises/meetup/CMakeLists.txt index b080690d..a081426b 100644 --- a/exercises/meetup/CMakeLists.txt +++ b/exercises/meetup/CMakeLists.txt @@ -24,7 +24,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/meetup/meetup_test.cpp b/exercises/meetup/meetup_test.cpp index 5264b4cf..d4e8e992 100644 --- a/exercises/meetup/meetup_test.cpp +++ b/exercises/meetup/meetup_test.cpp @@ -1,5 +1,4 @@ #include "meetup.h" -#define CATCH_CONFIG_MAIN #include #include "test/catch.hpp" diff --git a/exercises/meetup/test/tests-main.cpp b/exercises/meetup/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/meetup/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/nth-prime/CMakeLists.txt b/exercises/nth-prime/CMakeLists.txt index b81b3564..82e6d503 100644 --- a/exercises/nth-prime/CMakeLists.txt +++ b/exercises/nth-prime/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/nth-prime/nth_prime_test.cpp b/exercises/nth-prime/nth_prime_test.cpp index 75257516..931f729b 100644 --- a/exercises/nth-prime/nth_prime_test.cpp +++ b/exercises/nth-prime/nth_prime_test.cpp @@ -1,5 +1,4 @@ #include "nth_prime.h" -#define CATCH_CONFIG_MAIN #include "test/catch.hpp" #include diff --git a/exercises/nth-prime/test/tests-main.cpp b/exercises/nth-prime/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/nth-prime/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/nucleotide-count/CMakeLists.txt b/exercises/nucleotide-count/CMakeLists.txt index b81b3564..82e6d503 100644 --- a/exercises/nucleotide-count/CMakeLists.txt +++ b/exercises/nucleotide-count/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/nucleotide-count/nucleotide_count_test.cpp b/exercises/nucleotide-count/nucleotide_count_test.cpp index 9cb335f8..c403834e 100644 --- a/exercises/nucleotide-count/nucleotide_count_test.cpp +++ b/exercises/nucleotide-count/nucleotide_count_test.cpp @@ -1,5 +1,4 @@ #include "nucleotide_count.h" -#define CATCH_CONFIG_MAIN #include "test/catch.hpp" #include #include diff --git a/exercises/nucleotide-count/test/tests-main.cpp b/exercises/nucleotide-count/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/nucleotide-count/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/pangram/CMakeLists.txt b/exercises/pangram/CMakeLists.txt index b81b3564..82e6d503 100644 --- a/exercises/pangram/CMakeLists.txt +++ b/exercises/pangram/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/pangram/pangram_test.cpp b/exercises/pangram/pangram_test.cpp index b73cb4d0..179cff5b 100644 --- a/exercises/pangram/pangram_test.cpp +++ b/exercises/pangram/pangram_test.cpp @@ -1,5 +1,4 @@ #include "pangram.h" -#define CATCH_CONFIG_MAIN #include "test/catch.hpp" TEST_CASE("sentence_empty") diff --git a/exercises/pangram/test/tests-main.cpp b/exercises/pangram/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/pangram/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/pascals-triangle/CMakeLists.txt b/exercises/pascals-triangle/CMakeLists.txt index b81b3564..82e6d503 100644 --- a/exercises/pascals-triangle/CMakeLists.txt +++ b/exercises/pascals-triangle/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/pascals-triangle/pascals_triangle_test.cpp b/exercises/pascals-triangle/pascals_triangle_test.cpp index 7463e6c8..50590b93 100644 --- a/exercises/pascals-triangle/pascals_triangle_test.cpp +++ b/exercises/pascals-triangle/pascals_triangle_test.cpp @@ -1,5 +1,4 @@ #include "pascals_triangle.h" -#define CATCH_CONFIG_MAIN #include "test/catch.hpp" TEST_CASE("zero_rows") diff --git a/exercises/pascals-triangle/test/tests-main.cpp b/exercises/pascals-triangle/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/pascals-triangle/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/phone-number/CMakeLists.txt b/exercises/phone-number/CMakeLists.txt index b81b3564..82e6d503 100644 --- a/exercises/phone-number/CMakeLists.txt +++ b/exercises/phone-number/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/phone-number/phone_number_test.cpp b/exercises/phone-number/phone_number_test.cpp index 91f0b4c1..6bda259d 100644 --- a/exercises/phone-number/phone_number_test.cpp +++ b/exercises/phone-number/phone_number_test.cpp @@ -1,6 +1,5 @@ #include "phone_number.h" -#define CATCH_CONFIG_MAIN #include "test/catch.hpp" #include diff --git a/exercises/phone-number/test/tests-main.cpp b/exercises/phone-number/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/phone-number/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/prime-factors/CMakeLists.txt b/exercises/prime-factors/CMakeLists.txt index b81b3564..82e6d503 100644 --- a/exercises/prime-factors/CMakeLists.txt +++ b/exercises/prime-factors/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/prime-factors/prime_factors_test.cpp b/exercises/prime-factors/prime_factors_test.cpp index 3943bf96..4e0d8e3f 100644 --- a/exercises/prime-factors/prime_factors_test.cpp +++ b/exercises/prime-factors/prime_factors_test.cpp @@ -1,5 +1,4 @@ #include "prime_factors.h" -#define CATCH_CONFIG_MAIN #include "test/catch.hpp" TEST_CASE("_1_yields_empty") diff --git a/exercises/prime-factors/test/tests-main.cpp b/exercises/prime-factors/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/prime-factors/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/queen-attack/CMakeLists.txt b/exercises/queen-attack/CMakeLists.txt index b81b3564..82e6d503 100644 --- a/exercises/queen-attack/CMakeLists.txt +++ b/exercises/queen-attack/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/queen-attack/queen_attack_test.cpp b/exercises/queen-attack/queen_attack_test.cpp index eae5436d..72f6305f 100644 --- a/exercises/queen-attack/queen_attack_test.cpp +++ b/exercises/queen-attack/queen_attack_test.cpp @@ -1,5 +1,4 @@ #include "queen_attack.h" -#define CATCH_CONFIG_MAIN #include "test/catch.hpp" TEST_CASE("queens_in_default_positions") diff --git a/exercises/queen-attack/test/tests-main.cpp b/exercises/queen-attack/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/queen-attack/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/raindrops/CMakeLists.txt b/exercises/raindrops/CMakeLists.txt index b81b3564..82e6d503 100644 --- a/exercises/raindrops/CMakeLists.txt +++ b/exercises/raindrops/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/raindrops/raindrops_test.cpp b/exercises/raindrops/raindrops_test.cpp index 354e6f9d..744c00ce 100644 --- a/exercises/raindrops/raindrops_test.cpp +++ b/exercises/raindrops/raindrops_test.cpp @@ -1,5 +1,4 @@ #include "raindrops.h" -#define CATCH_CONFIG_MAIN #include "test/catch.hpp" TEST_CASE("one_yields_itself") diff --git a/exercises/raindrops/test/tests-main.cpp b/exercises/raindrops/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/raindrops/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/reverse-string/CMakeLists.txt b/exercises/reverse-string/CMakeLists.txt index b81b3564..82e6d503 100644 --- a/exercises/reverse-string/CMakeLists.txt +++ b/exercises/reverse-string/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/reverse-string/reverse_string_test.cpp b/exercises/reverse-string/reverse_string_test.cpp index 836640ef..17164f9f 100644 --- a/exercises/reverse-string/reverse_string_test.cpp +++ b/exercises/reverse-string/reverse_string_test.cpp @@ -1,5 +1,4 @@ #include "reverse_string.h" -#define CATCH_CONFIG_MAIN #include "test/catch.hpp" TEST_CASE("an_empty_string") diff --git a/exercises/reverse-string/test/tests-main.cpp b/exercises/reverse-string/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/reverse-string/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/rna-transcription/CMakeLists.txt b/exercises/rna-transcription/CMakeLists.txt index b81b3564..82e6d503 100644 --- a/exercises/rna-transcription/CMakeLists.txt +++ b/exercises/rna-transcription/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/rna-transcription/rna_transcription_test.cpp b/exercises/rna-transcription/rna_transcription_test.cpp index 366a2d69..53108fae 100644 --- a/exercises/rna-transcription/rna_transcription_test.cpp +++ b/exercises/rna-transcription/rna_transcription_test.cpp @@ -1,5 +1,4 @@ #include "rna_transcription.h" -#define CATCH_CONFIG_MAIN #include "test/catch.hpp" TEST_CASE("transcribes_cytidine_to_guanosine") diff --git a/exercises/rna-transcription/test/tests-main.cpp b/exercises/rna-transcription/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/rna-transcription/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/robot-name/CMakeLists.txt b/exercises/robot-name/CMakeLists.txt index b81b3564..82e6d503 100644 --- a/exercises/robot-name/CMakeLists.txt +++ b/exercises/robot-name/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/robot-name/robot_name_test.cpp b/exercises/robot-name/robot_name_test.cpp index 80d29602..1361385b 100644 --- a/exercises/robot-name/robot_name_test.cpp +++ b/exercises/robot-name/robot_name_test.cpp @@ -1,5 +1,4 @@ #include "robot_name.h" -#define CATCH_CONFIG_MAIN #include "test/catch.hpp" #include #include diff --git a/exercises/robot-name/test/tests-main.cpp b/exercises/robot-name/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/robot-name/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/robot-simulator/CMakeLists.txt b/exercises/robot-simulator/CMakeLists.txt index b81b3564..82e6d503 100644 --- a/exercises/robot-simulator/CMakeLists.txt +++ b/exercises/robot-simulator/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/robot-simulator/robot_simulator_test.cpp b/exercises/robot-simulator/robot_simulator_test.cpp index 8199263e..a1837934 100644 --- a/exercises/robot-simulator/robot_simulator_test.cpp +++ b/exercises/robot-simulator/robot_simulator_test.cpp @@ -1,4 +1,3 @@ -#define CATCH_CONFIG_MAIN #include "test/catch.hpp" #include "robot_simulator.h" diff --git a/exercises/robot-simulator/test/tests-main.cpp b/exercises/robot-simulator/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/robot-simulator/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/roman-numerals/CMakeLists.txt b/exercises/roman-numerals/CMakeLists.txt index b81b3564..82e6d503 100644 --- a/exercises/roman-numerals/CMakeLists.txt +++ b/exercises/roman-numerals/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/roman-numerals/roman_numerals_test.cpp b/exercises/roman-numerals/roman_numerals_test.cpp index f99b7e44..611a834d 100644 --- a/exercises/roman-numerals/roman_numerals_test.cpp +++ b/exercises/roman-numerals/roman_numerals_test.cpp @@ -1,5 +1,4 @@ #include "roman_numerals.h" -#define CATCH_CONFIG_MAIN #include "test/catch.hpp" TEST_CASE("one_yields_I") diff --git a/exercises/roman-numerals/test/tests-main.cpp b/exercises/roman-numerals/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/roman-numerals/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/say/CMakeLists.txt b/exercises/say/CMakeLists.txt index b81b3564..82e6d503 100644 --- a/exercises/say/CMakeLists.txt +++ b/exercises/say/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/say/say_test.cpp b/exercises/say/say_test.cpp index c1ba7ab2..fad26b46 100644 --- a/exercises/say/say_test.cpp +++ b/exercises/say/say_test.cpp @@ -1,5 +1,4 @@ #include "say.h" -#define CATCH_CONFIG_MAIN #include "test/catch.hpp" TEST_CASE("zero") diff --git a/exercises/say/test/tests-main.cpp b/exercises/say/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/say/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/scrabble-score/CMakeLists.txt b/exercises/scrabble-score/CMakeLists.txt index b81b3564..82e6d503 100644 --- a/exercises/scrabble-score/CMakeLists.txt +++ b/exercises/scrabble-score/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/scrabble-score/scrabble_score_test.cpp b/exercises/scrabble-score/scrabble_score_test.cpp index 96266549..6d0e9c45 100644 --- a/exercises/scrabble-score/scrabble_score_test.cpp +++ b/exercises/scrabble-score/scrabble_score_test.cpp @@ -1,5 +1,4 @@ #include "scrabble_score.h" -#define CATCH_CONFIG_MAIN #include "test/catch.hpp" TEST_CASE("scores_an_empty_word_as_zero") diff --git a/exercises/scrabble-score/test/tests-main.cpp b/exercises/scrabble-score/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/scrabble-score/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/series/CMakeLists.txt b/exercises/series/CMakeLists.txt index b81b3564..82e6d503 100644 --- a/exercises/series/CMakeLists.txt +++ b/exercises/series/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/series/series_test.cpp b/exercises/series/series_test.cpp index 9f2c9e4e..3d027cb4 100644 --- a/exercises/series/series_test.cpp +++ b/exercises/series/series_test.cpp @@ -1,5 +1,4 @@ #include "series.h" -#define CATCH_CONFIG_MAIN #include "test/catch.hpp" #include diff --git a/exercises/series/test/tests-main.cpp b/exercises/series/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/series/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/sieve/CMakeLists.txt b/exercises/sieve/CMakeLists.txt index b81b3564..82e6d503 100644 --- a/exercises/sieve/CMakeLists.txt +++ b/exercises/sieve/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/sieve/sieve_test.cpp b/exercises/sieve/sieve_test.cpp index 613aebf4..c5f74bbe 100644 --- a/exercises/sieve/sieve_test.cpp +++ b/exercises/sieve/sieve_test.cpp @@ -1,5 +1,4 @@ #include "sieve.h" -#define CATCH_CONFIG_MAIN #include "test/catch.hpp" TEST_CASE("no_primes_under_two") diff --git a/exercises/sieve/test/tests-main.cpp b/exercises/sieve/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/sieve/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/space-age/CMakeLists.txt b/exercises/space-age/CMakeLists.txt index b81b3564..82e6d503 100644 --- a/exercises/space-age/CMakeLists.txt +++ b/exercises/space-age/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/space-age/space_age_test.cpp b/exercises/space-age/space_age_test.cpp index c6331717..ba5edfdd 100644 --- a/exercises/space-age/space_age_test.cpp +++ b/exercises/space-age/space_age_test.cpp @@ -1,5 +1,4 @@ #include "space_age.h" -#define CATCH_CONFIG_MAIN #include "test/catch.hpp" TEST_CASE("age_in_seconds") diff --git a/exercises/space-age/test/tests-main.cpp b/exercises/space-age/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/space-age/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/sum-of-multiples/CMakeLists.txt b/exercises/sum-of-multiples/CMakeLists.txt index b81b3564..82e6d503 100644 --- a/exercises/sum-of-multiples/CMakeLists.txt +++ b/exercises/sum-of-multiples/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/sum-of-multiples/sum_of_multiples_test.cpp b/exercises/sum-of-multiples/sum_of_multiples_test.cpp index d1eda174..2cda231f 100644 --- a/exercises/sum-of-multiples/sum_of_multiples_test.cpp +++ b/exercises/sum-of-multiples/sum_of_multiples_test.cpp @@ -1,5 +1,4 @@ #include "sum_of_multiples.h" -#define CATCH_CONFIG_MAIN #include "test/catch.hpp" TEST_CASE("sum_to_1_yields_0") diff --git a/exercises/sum-of-multiples/test/tests-main.cpp b/exercises/sum-of-multiples/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/sum-of-multiples/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/triangle/CMakeLists.txt b/exercises/triangle/CMakeLists.txt index b81b3564..82e6d503 100644 --- a/exercises/triangle/CMakeLists.txt +++ b/exercises/triangle/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/triangle/test/tests-main.cpp b/exercises/triangle/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/triangle/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/triangle/triangle_test.cpp b/exercises/triangle/triangle_test.cpp index 0e1cacf3..9b31cd54 100644 --- a/exercises/triangle/triangle_test.cpp +++ b/exercises/triangle/triangle_test.cpp @@ -1,5 +1,4 @@ #include "triangle.h" -#define CATCH_CONFIG_MAIN #include "test/catch.hpp" #include diff --git a/exercises/trinary/CMakeLists.txt b/exercises/trinary/CMakeLists.txt index b81b3564..82e6d503 100644 --- a/exercises/trinary/CMakeLists.txt +++ b/exercises/trinary/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/trinary/test/tests-main.cpp b/exercises/trinary/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/trinary/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/trinary/trinary_test.cpp b/exercises/trinary/trinary_test.cpp index 748eaeb3..6021fe2f 100644 --- a/exercises/trinary/trinary_test.cpp +++ b/exercises/trinary/trinary_test.cpp @@ -1,5 +1,4 @@ #include "trinary.h" -#define CATCH_CONFIG_MAIN #include "test/catch.hpp" TEST_CASE("_1_yields_decimal_1") diff --git a/exercises/word-count/CMakeLists.txt b/exercises/word-count/CMakeLists.txt index b81b3564..82e6d503 100644 --- a/exercises/word-count/CMakeLists.txt +++ b/exercises/word-count/CMakeLists.txt @@ -18,7 +18,7 @@ else() endif() # Build executable from sources and headers -add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h) +add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp) set_target_properties(${exercise} PROPERTIES CXX_STANDARD 11 diff --git a/exercises/word-count/test/tests-main.cpp b/exercises/word-count/test/tests-main.cpp new file mode 100644 index 00000000..0c7c351f --- /dev/null +++ b/exercises/word-count/test/tests-main.cpp @@ -0,0 +1,2 @@ +#define CATCH_CONFIG_MAIN +#include "catch.hpp" diff --git a/exercises/word-count/word_count_test.cpp b/exercises/word-count/word_count_test.cpp index 40c564a2..f0acc765 100644 --- a/exercises/word-count/word_count_test.cpp +++ b/exercises/word-count/word_count_test.cpp @@ -1,5 +1,4 @@ #include "word_count.h" -#define CATCH_CONFIG_MAIN #include "test/catch.hpp" #include From 17e6ba474ab159bcc9fb5a24d373683e22e251c2 Mon Sep 17 00:00:00 2001 From: Patrick Jackson Date: Sat, 20 Apr 2019 08:44:50 -0700 Subject: [PATCH 2/2] Fixing uncovered include error in clock_test. --- exercises/clock/clock_test.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/exercises/clock/clock_test.cpp b/exercises/clock/clock_test.cpp index 3ebc24ba..8e78393d 100644 --- a/exercises/clock/clock_test.cpp +++ b/exercises/clock/clock_test.cpp @@ -1,5 +1,6 @@ #include "clock.h" #include "test/catch.hpp" +#include using namespace std;