Merge pull request #13 from naviqore/feature/clean-up-project-structure

ENH: add build on ubuntu
naviqore · Aug 16, 2024 · 2a2b9e7 · 2a2b9e7
2 parents 4fe1f40 + ee716b9
commit 2a2b9e7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/.github/workflows/build-matrix.yml b/.github/workflows/build-matrix.yml
@@ -10,12 +10,12 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [windows-latest] # , ubuntu-latest , macos-latest
+        os: [windows-latest, ubuntu-latest] #  , macos-latest
         include:
           - os: windows-latest
             compiler: msvc
-#          - os: ubuntu-latest
-#            compiler: gcc
+              - os: ubuntu-latest
+                compiler: gcc
     #          - os: macos-latest
     #            compiler: clang
     steps:
@@ -43,6 +43,6 @@ jobs:
         run: |
           cmake --build build --config Release
 
-      - name: Test
+      - name: Run tests
         run: |
-          cmake --build build --target test
+          ctest --test-dir build --output-on-failure -C Release
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -56,3 +56,6 @@ add_subdirectory(raptor)
 add_subdirectory(raptor/test)
 #TODO set up project in a new branch JIRA story
 # add_subdirectory(gtfsRaptorConfig)
+
+include(CTest)
+enable_testing()
diff --git a/schedule/test/test_gtfsReaderTxt.cpp b/schedule/test/test_gtfsReaderTxt.cpp
@@ -22,13 +22,6 @@
 #include <fmt/core.h>
 
 
-/////////////// TESTS ///////////////
-/////////////////////////////////////
-/// RUN TESTS IN DEBUG MODE ONLY ////
-/////////////////////////////////////
-/////////////////////////////////////
-
-
 class GtfsCsvReaderStrategiesTest : public testing::Test
 {
 protected: