OPENMIND_USE_TESTS

ohhmm · Mar 1, 2024 · ecceb9c · ecceb9c
1 parent 49f3e2e
commit ecceb9c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -2,9 +2,9 @@ name: CMake
 
 on:
   push:
-    branches: [ "main" ]
+    branches: [ "main", "develop" ]
   pull_request:
-    branches: [ "main" ]
+    branches: [ "main", "develop" ]
 
 env:
   # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
@@ -33,4 +33,4 @@ jobs:
 
     - name: Check
       working-directory: ${{github.workspace}}/build
-      run: ctest . -j`nproc` -C ${{env.BUILD_TYPE}} -R skrypt --rerun-failed --output-on-failure
+      run: ctest . -j`nproc` -C ${{env.BUILD_TYPE}} --test-dir libskrypt --rerun-failed --output-on-failure
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,7 +9,6 @@ set(CMAKE_CXX_EXTENSIONS OFF)
 option(OPENMIND_DEBUG_CHECKS "Additional debug checks" OFF)
 find_package(OpenCL)
 option(OPENMIND_USE_OPENCL "OpenCL GPU calculations" ${OpenCL_FOUND})
-option(OPENMIND_USE_TESTS "Tests" OFF)
 option(OPENMIND_MATH_USE_LEVELDB_CACHE "DB cache solutions" ON)
 set(BOOST_ADDITIONAL_COMPONENTS program_options CACHE VERSION "Boost components" FORCE)
 # Tell OpenMind to use any boost version installed in the system if any
@@ -35,5 +34,9 @@ FetchContent_Declare(openmind
     GIT_TAG main)
 FetchContent_MakeAvailable(openmind)
 
+if(BUILD_TESTS OR OPENMIND_BUILD_TESTS)
+    enable_testing()    
+endif(BUILD_TESTS OR OPENMIND_BUILD_TESTS)
+
 # OpenMind: traverse subprojects
 fold(libskrypt) # parse libskrypt prior to skrypt