From 629f8b2b48d44b8b3f7621ad60885e9e853e9f5d Mon Sep 17 00:00:00 2001
From: "Charlton, Scott R." <charlton@usgs.gov>
Date: Fri, 19 Apr 2024 11:50:16 -0600
Subject: [PATCH] Fixed disabled test properties

---
 .github/workflows/cmake.yml |  4 ++--
 CMakeLists.txt              |  2 +-
 cmemcheck.cmake             |  2 +-
 mytest/CMakeLists.txt       | 16 +++++-----------
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
index 10e693f8c..ed4b02e25 100644
--- a/.github/workflows/cmake.yml
+++ b/.github/workflows/cmake.yml
@@ -24,7 +24,7 @@ on:
       - 'Version3/**'
       - 'README.md'
   schedule:
-    - cron: '1 2 2/7 * *'
+    - cron: '1 2 * * 2'
   workflow_dispatch:
 
 jobs:
@@ -167,7 +167,7 @@ jobs:
       run: ctest -S ctest.cmake -DCTEST_TEST_TIMEOUT=900
 
     - name: CMemCheck (Linux)
-      if: runner.os == 'Linux'
+      if: runner.os == 'Linux' && github.event_name == 'schedule'
       run: ctest -S cmemcheck.cmake -DCTEST_TEST_TIMEOUT=900
 
     - name: Upload results
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5001fa163..45be2435d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -162,7 +162,7 @@ if(PHRQC_USE_GMP)
 endif()
 
 option(PHRQC_TESTING "Set TESTING preprocessor definition" OFF)
-option(PHRQC_ENABLE_REGRESSION_TESTING "When TESTING, enable tests that take longer to run" OFF)
+option(PHRQC_ENABLE_REGRESSION_TESTING "Enables all tests including tests that take over 600 seconds to run" OFF)
 
 if(MSVC)
 
diff --git a/cmemcheck.cmake b/cmemcheck.cmake
index 775463b20..f3262d264 100644
--- a/cmemcheck.cmake
+++ b/cmemcheck.cmake
@@ -22,7 +22,7 @@ find_program(CTEST_MEMORYCHECK_COMMAND NAMES valgrind)
 ctest_empty_binary_directory(${CTEST_BINARY_DIRECTORY})
 ctest_start("Continuous")
 ctest_update()
-ctest_configure(OPTIONS -DPHRQC_TESTING:BOOL=ON)
+ctest_configure(OPTIONS "-DPHRQC_TESTING:BOOL=ON;-DPHRQC_ENABLE_REGRESSION_TESTING:BOOL=ON")
 ctest_build()
 if(${CMAKE_VERSION} VERSION_LESS "3.29")
   ctest_memcheck(EXCLUDE "numdiff" EXCLUDE_LABEL "long_memcheck" PARALLEL_LEVEL 2)
diff --git a/mytest/CMakeLists.txt b/mytest/CMakeLists.txt
index 6467023aa..e9f517425 100644
--- a/mytest/CMakeLists.txt
+++ b/mytest/CMakeLists.txt
@@ -830,21 +830,15 @@ if (NUMDIFF_COMMAND)
         endif()
       endforeach()
     endif()
-
-    # # disable tests that take too long
-    # if (${prefix} IN_LIST SKIP)
-    #   set_tests_properties(${test_name} PROPERTIES DISABLED TRUE)
-    # endif()
   endforeach()
 endif()
 
 if (NOT PHRQC_ENABLE_REGRESSION_TESTING)
-  foreach(test ${TESTS})
-    get_test_property(test_labels ${test} LABELS)
-    if ("long_debug" IN_LIST test_labels)
-      set_tests_properties(${test} PROPERTIES DISABLED TRUE)
-    endif()
-    if ("long_memcheck" IN_LIST test_labels)
+  get_property(all_tests DIRECTORY PROPERTY TESTS)
+  foreach(test ${all_tests})
+    get_test_property(${test} LABELS test_labels)
+    if ("long_debug" IN_LIST test_labels OR "long_memcheck" IN_LIST test_labels)
+      # message(STATUS "disabling ${test}" )
       set_tests_properties(${test} PROPERTIES DISABLED TRUE)
     endif()
   endforeach()