try to get camp to take -Wno-shadow flag. do not run unit tests for g…

…pu builds
GEOS-DEV · Oct 22, 2023 · 62418dc · 62418dc
1 parent b4c6c39
commit 62418dc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/.github/workflows/continuousIntegration.yml b/.github/workflows/continuousIntegration.yml
@@ -89,6 +89,7 @@ jobs:
             CMAKE_C_COMPILER: clang
             CMAKE_BUILD_TYPE: Release
             ENABLE_CUDA: ON
+            BUILD_AND_TEST_ARGS: "--disable-unit-tests"
 
           - name: RHEL8.8-gcc12-cuda11-rel (ubi8.8, gcc 12.2.1, cuda-12.2.2, Release)
             DOCKER_REPOSITORY: geosx/ubi8:ubi8.8-cuda12.2.2
@@ -97,6 +98,7 @@ jobs:
             CMAKE_C_COMPILER: /opt/rh/gcc-toolset-12/root/bin/gcc
             CMAKE_BUILD_TYPE: Release
             ENABLE_CUDA: ON
+            BUILD_AND_TEST_ARGS: "--disable-unit-tests"
 
     steps:
     - name: Checkout Repository

diff --git a/cmake/CMakeBasics.cmake b/cmake/CMakeBasics.cmake
@@ -38,3 +38,4 @@ endif()
 
 
 set( CAMP_ENABLE_TESTS OFF CACHE BOOL "")
+target_compile_options( camp PRIVATE "-Wno-shadow") 
diff --git a/scripts/ci_build_and_test_in_container.sh b/scripts/ci_build_and_test_in_container.sh
@@ -55,7 +55,10 @@ if [[ "$*" == *--test-documentation* ]]; then
 fi
 
 or_die make
-or_die ctest --output-on-failure
+
+if [[ "$*" != *--disable-unit-tests* ]]; then
+  or_die ctest --output-on-failure -E "testUncrustifyCheck|testDoxygenCheck"
+fi
 
 
 exit 0