exercism · arcuru · Apr 21, 2019 · Apr 20, 2019 · Apr 20, 2019
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -0,0 +1,2 @@
+#define CATCH_CONFIG_MAIN
+#include "catch.hpp"
diff --git 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
@@ -1,5 +1,4 @@
 #include "allergies.h"
-#define CATCH_CONFIG_MAIN
 #include "test/catch.hpp"
 
 #include <string>

diff --git a/exercises/allergies/test/tests-main.cpp 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,4 @@
 #include "binary_search_tree.h"
-#define CATCH_CONFIG_MAIN
 #include "test/catch.hpp"
 #include <vector>
 

diff --git a/exercises/binary-search-tree/test/tests-main.cpp 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
@@ -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
@@ -1,5 +1,4 @@
 #include "binary_search.h"
-#define CATCH_CONFIG_MAIN
 #include "test/catch.hpp"
 #include <stdexcept>
 #include <vector>

diff --git a/exercises/binary-search/test/tests-main.cpp 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
@@ -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
@@ -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
@@ -0,0 +1,2 @@
+#define CATCH_CONFIG_MAIN
+#include "catch.hpp"
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -0,0 +1,2 @@
+#define CATCH_CONFIG_MAIN
+#include "catch.hpp"
diff --git 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
@@ -1,6 +1,6 @@
 #include "clock.h"
-#define CATCH_CONFIG_MAIN
 #include "test/catch.hpp"
+#include <sstream>
 
 using namespace std;
 

diff --git a/exercises/clock/test/tests-main.cpp 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -0,0 +1,2 @@
+#define CATCH_CONFIG_MAIN
+#include "catch.hpp"
diff --git 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
@@ -1,5 +1,4 @@
 #include "etl.h"
-#define CATCH_CONFIG_MAIN
 #include <map>
 #include "test/catch.hpp"
 

diff --git a/exercises/etl/test/tests-main.cpp 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
@@ -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
@@ -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
@@ -0,0 +1,2 @@
+#define CATCH_CONFIG_MAIN
+#include "catch.hpp"
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,4 @@
 #include "grade_school.h"
-#define CATCH_CONFIG_MAIN
 #include <map>
 #include "test/catch.hpp"
 

diff --git a/exercises/grade-school/test/tests-main.cpp 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
@@ -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
@@ -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
@@ -0,0 +1,2 @@
+#define CATCH_CONFIG_MAIN
+#include "catch.hpp"
diff --git 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
@@ -1,6 +1,5 @@
 #include "hamming.h"
 #include <stdexcept>
-#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
@@ -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
@@ -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
@@ -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
@@ -0,0 +1,2 @@
+#define CATCH_CONFIG_MAIN
+#include "catch.hpp"
diff --git 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
@@ -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
@@ -0,0 +1,2 @@
+#define CATCH_CONFIG_MAIN
+#include "catch.hpp"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#define CATCH_CONFIG_MAIN
		#include "catch.hpp"