Using a common Catch main object for development. (#276)

* Using a common Catch main object for development. * Run hello-world as a student in CI. * Modifying CMake to support individual tests. * Revert "Run hello-world as a student in CI." This reverts commit 527425d. * Changing CMake if statement for consistency.
exercism · Jun 1, 2019 · 2d6b671 · 2d6b671
1 parent d4facc8
commit 2d6b671
Show file tree

Hide file tree

Showing 53 changed files with 15,341 additions and 99 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -22,7 +22,9 @@ matrix:
           packages:
             - clang-3.8
 
-    - env: COMPILER=clang++-7
+    - env:
+      - COMPILER=clang++-7
+      - EXERCISM_COMMON_CATCH=false
       addons:
         apt:
           sources:
@@ -43,7 +45,7 @@ before_install:
   - sudo add-apt-repository -y ppa:samuel-bachmann/boost
   - sudo apt-get -y -d update
 install:
-  - sudo apt-get -y install cmake3 ninja-build libboost-test1.60-dev libboost-date-time1.60-dev
+  - sudo apt-get -y install cmake3 ninja-build libboost-date-time1.60-dev
   - export CXX=${COMPILER}
   - ${CXX} --version
 script:

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -19,6 +19,16 @@ function(travis_fixup exercise_dir alt_exercise_root)
 endfunction()
 
 option(EXERCISM_RUN_ALL_TESTS "Run all Exercism tests" On)
+option(EXERCISM_COMMON_CATCH "Link against a common Catch2 main lib." On)
+
+if(EXERCISM_COMMON_CATCH)
+    add_library(catchlib OBJECT test/tests-main.cpp)
+    set_target_properties(catchlib PROPERTIES
+        CXX_STANDARD 11
+        CXX_STANDARD_REQUIRED OFF
+        CXX_EXTENSIONS OFF
+    )
+endif()
 
 file(GLOB exercise_list ${CMAKE_CURRENT_SOURCE_DIR}/exercises/*)
 

diff --git a/bin/check-exercises.sh b/bin/check-exercises.sh
@@ -9,7 +9,13 @@ set -e
 repo=$(cd "$(dirname "$0")/.." && pwd)
 
 # Configure all the tests.
-cmake -G Ninja "$repo"
+if [ "$EXERCISM_COMMON_CATCH" == "false" ]; then
+    echo "Using bundled Catch main libraries."
+    cmake -G Ninja -DEXERCISM_COMMON_CATCH=OFF "$repo"
+else
+    echo "Using a common Catch main library."
+    cmake -G Ninja "$repo"
+fi
 echo ""
 
 if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then

diff --git a/exercises/acronym/CMakeLists.txt b/exercises/acronym/CMakeLists.txt
@@ -17,8 +17,14 @@ else()
     set(exercise_cpp "")
 endif()
 
-# Build executable from sources and headers
-add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp)
+# Use the common Catch library?
+if(EXERCISM_COMMON_CATCH)
+    # For Exercism track development only
+    add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h $<TARGET_OBJECTS:catchlib>)
+else()
+    # Build executable from sources and headers
+    add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp)
+endif()
 
 set_target_properties(${exercise} PROPERTIES
     CXX_STANDARD 11

diff --git a/exercises/all-your-base/CMakeLists.txt b/exercises/all-your-base/CMakeLists.txt
@@ -17,8 +17,14 @@ else()
     set(exercise_cpp "")
 endif()
 
-# Build executable from sources and headers
-add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp)
+# Use the common Catch library?
+if(EXERCISM_COMMON_CATCH)
+    # For Exercism track development only
+    add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h $<TARGET_OBJECTS:catchlib>)
+else()
+    # Build executable from sources and headers
+    add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp)
+endif()
 
 set_target_properties(${exercise} PROPERTIES
     CXX_STANDARD 11

diff --git a/exercises/allergies/CMakeLists.txt b/exercises/allergies/CMakeLists.txt
@@ -17,8 +17,14 @@ else()
     set(exercise_cpp "")
 endif()
 
-# Build executable from sources and headers
-add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp)
+# Use the common Catch library?
+if(EXERCISM_COMMON_CATCH)
+    # For Exercism track development only
+    add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h $<TARGET_OBJECTS:catchlib>)
+else()
+    # Build executable from sources and headers
+    add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp)
+endif()
 
 set_target_properties(${exercise} PROPERTIES
     CXX_STANDARD 11

diff --git a/exercises/anagram/CMakeLists.txt b/exercises/anagram/CMakeLists.txt
@@ -17,8 +17,14 @@ else()
     set(exercise_cpp "")
 endif()
 
-# Build executable from sources and headers
-add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp)
+# Use the common Catch library?
+if(EXERCISM_COMMON_CATCH)
+    # For Exercism track development only
+    add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h $<TARGET_OBJECTS:catchlib>)
+else()
+    # Build executable from sources and headers
+    add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp)
+endif()
 
 set_target_properties(${exercise} PROPERTIES
     CXX_STANDARD 11

diff --git a/exercises/atbash-cipher/CMakeLists.txt b/exercises/atbash-cipher/CMakeLists.txt
@@ -17,8 +17,14 @@ else()
     set(exercise_cpp "")
 endif()
 
-# Build executable from sources and headers
-add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp)
+# Use the common Catch library?
+if(EXERCISM_COMMON_CATCH)
+    # For Exercism track development only
+    add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h $<TARGET_OBJECTS:catchlib>)
+else()
+    # Build executable from sources and headers
+    add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp)
+endif()
 
 set_target_properties(${exercise} PROPERTIES
     CXX_STANDARD 11

diff --git a/exercises/beer-song/CMakeLists.txt b/exercises/beer-song/CMakeLists.txt
@@ -17,8 +17,14 @@ else()
     set(exercise_cpp "")
 endif()
 
-# Build executable from sources and headers
-add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp)
+# Use the common Catch library?
+if(EXERCISM_COMMON_CATCH)
+    # For Exercism track development only
+    add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h $<TARGET_OBJECTS:catchlib>)
+else()
+    # Build executable from sources and headers
+    add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp)
+endif()
 
 set_target_properties(${exercise} PROPERTIES
     CXX_STANDARD 11

diff --git a/exercises/binary-search-tree/CMakeLists.txt b/exercises/binary-search-tree/CMakeLists.txt
@@ -17,8 +17,14 @@ else()
     set(exercise_cpp "")
 endif()
 
-# Build executable from sources and headers
-add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp)
+# Use the common Catch library?
+if(EXERCISM_COMMON_CATCH)
+    # For Exercism track development only
+    add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h $<TARGET_OBJECTS:catchlib>)
+else()
+    # Build executable from sources and headers
+    add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp)
+endif()
 
 set_target_properties(${exercise} PROPERTIES
     CXX_STANDARD 11

diff --git a/exercises/binary-search/CMakeLists.txt b/exercises/binary-search/CMakeLists.txt
@@ -17,8 +17,14 @@ else()
     set(exercise_cpp "")
 endif()
 
-# Build executable from sources and headers
-add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp)
+# Use the common Catch library?
+if(EXERCISM_COMMON_CATCH)
+    # For Exercism track development only
+    add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h $<TARGET_OBJECTS:catchlib>)
+else()
+    # Build executable from sources and headers
+    add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp)
+endif()
 
 set_target_properties(${exercise} PROPERTIES
     CXX_STANDARD 11

diff --git a/exercises/binary/CMakeLists.txt b/exercises/binary/CMakeLists.txt
@@ -17,8 +17,14 @@ else()
     set(exercise_cpp "")
 endif()
 
-# Build executable from sources and headers
-add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp)
+# Use the common Catch library?
+if(EXERCISM_COMMON_CATCH)
+    # For Exercism track development only
+    add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h $<TARGET_OBJECTS:catchlib>)
+else()
+    # Build executable from sources and headers
+    add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp)
+endif()
 
 set_target_properties(${exercise} PROPERTIES
     CXX_STANDARD 11

diff --git a/exercises/bob/CMakeLists.txt b/exercises/bob/CMakeLists.txt
@@ -17,8 +17,14 @@ else()
     set(exercise_cpp "")
 endif()
 
-# Build executable from sources and headers
-add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp)
+# Use the common Catch library?
+if(EXERCISM_COMMON_CATCH)
+    # For Exercism track development only
+    add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h $<TARGET_OBJECTS:catchlib>)
+else()
+    # Build executable from sources and headers
+    add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp)
+endif()
 
 set_target_properties(${exercise} PROPERTIES
     CXX_STANDARD 11

diff --git a/exercises/clock/CMakeLists.txt b/exercises/clock/CMakeLists.txt
@@ -17,8 +17,14 @@ else()
     set(exercise_cpp "")
 endif()
 
-# Build executable from sources and headers
-add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp)
+# Use the common Catch library?
+if(EXERCISM_COMMON_CATCH)
+    # For Exercism track development only
+    add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h $<TARGET_OBJECTS:catchlib>)
+else()
+    # Build executable from sources and headers
+    add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp)
+endif()
 
 set_target_properties(${exercise} PROPERTIES
     CXX_STANDARD 11

diff --git a/exercises/crypto-square/CMakeLists.txt b/exercises/crypto-square/CMakeLists.txt
@@ -17,8 +17,14 @@ else()
     set(exercise_cpp "")
 endif()
 
-# Build executable from sources and headers
-add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp)
+# Use the common Catch library?
+if(EXERCISM_COMMON_CATCH)
+    # For Exercism track development only
+    add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h $<TARGET_OBJECTS:catchlib>)
+else()
+    # Build executable from sources and headers
+    add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp)
+endif()
 
 set_target_properties(${exercise} PROPERTIES
     CXX_STANDARD 11

diff --git a/exercises/difference-of-squares/CMakeLists.txt b/exercises/difference-of-squares/CMakeLists.txt
@@ -17,8 +17,14 @@ else()
     set(exercise_cpp "")
 endif()
 
-# Build executable from sources and headers
-add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp)
+# Use the common Catch library?
+if(EXERCISM_COMMON_CATCH)
+    # For Exercism track development only
+    add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h $<TARGET_OBJECTS:catchlib>)
+else()
+    # Build executable from sources and headers
+    add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp)
+endif()
 
 set_target_properties(${exercise} PROPERTIES
     CXX_STANDARD 11

diff --git a/exercises/etl/CMakeLists.txt b/exercises/etl/CMakeLists.txt
@@ -17,8 +17,14 @@ else()
     set(exercise_cpp "")
 endif()
 
-# Build executable from sources and headers
-add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp)
+# Use the common Catch library?
+if(EXERCISM_COMMON_CATCH)
+    # For Exercism track development only
+    add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h $<TARGET_OBJECTS:catchlib>)
+else()
+    # Build executable from sources and headers
+    add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp)
+endif()
 
 set_target_properties(${exercise} PROPERTIES
     CXX_STANDARD 11

diff --git a/exercises/food-chain/CMakeLists.txt b/exercises/food-chain/CMakeLists.txt
@@ -17,8 +17,14 @@ else()
     set(exercise_cpp "")
 endif()
 
-# Build executable from sources and headers
-add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp)
+# Use the common Catch library?
+if(EXERCISM_COMMON_CATCH)
+    # For Exercism track development only
+    add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h $<TARGET_OBJECTS:catchlib>)
+else()
+    # Build executable from sources and headers
+    add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp)
+endif()
 
 set_target_properties(${exercise} PROPERTIES
     CXX_STANDARD 11

diff --git a/exercises/gigasecond/CMakeLists.txt b/exercises/gigasecond/CMakeLists.txt
@@ -23,8 +23,14 @@ else()
     set(exercise_cpp "")
 endif()
 
-# Build executable from sources and headers
-add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp)
+# Use the common Catch library?
+if(EXERCISM_COMMON_CATCH)
+    # For Exercism track development only
+    add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h $<TARGET_OBJECTS:catchlib>)
+else()
+    # Build executable from sources and headers
+    add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp)
+endif()
 
 set_target_properties(${exercise} PROPERTIES
     CXX_STANDARD 11

diff --git a/exercises/grade-school/CMakeLists.txt b/exercises/grade-school/CMakeLists.txt
@@ -17,8 +17,14 @@ else()
     set(exercise_cpp "")
 endif()
 
-# Build executable from sources and headers
-add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp)
+# Use the common Catch library?
+if(EXERCISM_COMMON_CATCH)
+    # For Exercism track development only
+    add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h $<TARGET_OBJECTS:catchlib>)
+else()
+    # Build executable from sources and headers
+    add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp)
+endif()
 
 set_target_properties(${exercise} PROPERTIES
     CXX_STANDARD 11

diff --git a/exercises/grains/CMakeLists.txt b/exercises/grains/CMakeLists.txt
@@ -17,8 +17,14 @@ else()
     set(exercise_cpp "")
 endif()
 
-# Build executable from sources and headers
-add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp)
+# Use the common Catch library?
+if(EXERCISM_COMMON_CATCH)
+    # For Exercism track development only
+    add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h $<TARGET_OBJECTS:catchlib>)
+else()
+    # Build executable from sources and headers
+    add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp)
+endif()
 
 set_target_properties(${exercise} PROPERTIES
     CXX_STANDARD 11

diff --git a/exercises/hamming/CMakeLists.txt b/exercises/hamming/CMakeLists.txt
@@ -17,8 +17,14 @@ else()
     set(exercise_cpp "")
 endif()
 
-# Build executable from sources and headers
-add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp)
+# Use the common Catch library?
+if(EXERCISM_COMMON_CATCH)
+    # For Exercism track development only
+    add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h $<TARGET_OBJECTS:catchlib>)
+else()
+    # Build executable from sources and headers
+    add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp)
+endif()
 
 set_target_properties(${exercise} PROPERTIES
     CXX_STANDARD 11

diff --git a/exercises/hello-world/CMakeLists.txt b/exercises/hello-world/CMakeLists.txt
@@ -17,8 +17,14 @@ else()
     set(exercise_cpp "")
 endif()
 
-# Build executable from sources and headers
-add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp)
+# Use the common Catch library?
+if(EXERCISM_COMMON_CATCH)
+    # For Exercism track development only
+    add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h $<TARGET_OBJECTS:catchlib>)
+else()
+    # Build executable from sources and headers
+    add_executable(${exercise} ${file}_test.cpp ${exercise_cpp} ${file}.h test/tests-main.cpp)
+endif()
 
 set_target_properties(${exercise} PROPERTIES
     CXX_STANDARD 11