Merge pull request #455 from currocam/master

Use make test in CI
MesserLab · Jul 15, 2024 · 8bc26b9 · 8bc26b9
2 parents 98dba8b + e589c0a
commit 8bc26b9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -123,9 +123,7 @@ jobs:
       - name: Test (Debug)
         run: |
           cd Debug
-          ./eidos -testEidos
-          ./slim -testEidos
-          ./slim -testSLiM
+          make test
 
       - name: Build (Release)
         run: |
@@ -137,9 +135,7 @@ jobs:
       - name: Test (Release)
         run: |
           cd Release
-          ./eidos -testEidos
-          ./slim -testEidos
-          ./slim -testSLiM
+          make test
 
       - name: Treesequence tests
         run: |
@@ -313,9 +309,7 @@ jobs:
       - name: Test (Release)
         run: |
           cd Release
-          ./eidos -testEidos
-          ./slim -testEidos
-          ./slim -testSLiM
+          make test
 
       - name: Treesequence tests
         shell: bash -l {0}

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -433,8 +433,14 @@ add_test(
   NAME testSLiM
   COMMAND ${TARGET_NAME_SLIM} -testSLiM
 )
-# test Eidos
+# test Eidos from SLiM
 add_test(
-  NAME testEidos
+  NAME testEidosSLiM
   COMMAND ${TARGET_NAME_SLIM} -testEidos
 )
+
+# test Eidos from Eidos
+add_test(
+  NAME testEidosEidos
+  COMMAND ${TARGET_NAME_EIDOS} -testEidos
+)