From a9850ad7484c9c4088cfd93838df109fc52a0750 Mon Sep 17 00:00:00 2001
From: James Foucar <jgfouca@sandia.gov>
Date: Thu, 14 Nov 2024 11:24:40 -0700
Subject: [PATCH 1/2] Fixes for p3 tests CMake settings

p3_tests needs to have baseline_gen label. Also, avoid doing
thread spreads when generating.
---
 .../eamxx/src/physics/p3/tests/CMakeLists.txt | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/components/eamxx/src/physics/p3/tests/CMakeLists.txt b/components/eamxx/src/physics/p3/tests/CMakeLists.txt
index d45314ccb9c..9d2b2419c97 100644
--- a/components/eamxx/src/physics/p3/tests/CMakeLists.txt
+++ b/components/eamxx/src/physics/p3/tests/CMakeLists.txt
@@ -50,18 +50,23 @@ endif()
 if (SCREAM_ENABLE_BASELINE_TESTS)
   if (SCREAM_ONLY_GENERATE_BASELINES)
     set(BASELINE_FILE_ARG "-g -b ${SCREAM_BASELINES_DIR}/data")
+    # We don't want to do thread spreads when generating. That
+    # could cause race conditions in the file system.
+    set(P3_THREADS "${SCREAM_TEST_MAX_THREADS}")
   else()
     set(BASELINE_FILE_ARG "-c -b ${SCREAM_BASELINES_DIR}/data")
+    set(P3_THREADS "1 ${SCREAM_TEST_MAX_THREADS} ${SCREAM_TEST_THREAD_INC}")
   endif()
 else()
   set(BASELINE_FILE_ARG "-n") # no baselines
+  set(P3_THREADS "1 ${SCREAM_TEST_MAX_THREADS} ${SCREAM_TEST_THREAD_INC}")
 endif()
 
 CreateUnitTest(p3_tests "${P3_TESTS_SRCS}"
   LIBS p3 p3_test_infra
   EXE_ARGS "--args ${BASELINE_FILE_ARG}"
-  THREADS 1 ${SCREAM_TEST_MAX_THREADS} ${SCREAM_TEST_THREAD_INC}
-  LABELS "p3;physics")
+  THREADS ${P3_THREADS}
+  LABELS "p3;physics;baseline_gen;baseline_cmp")
 
 # Make sure that a diff in the two implementation triggers a failed test (in debug only)
 # No need to run lots of different thread counts.
@@ -85,15 +90,16 @@ if (NOT SCREAM_P3_SMALL_KERNELS AND NOT SCREAM_ONLY_GENERATE_BASELINES)
     LIBS p3_sk p3_test_infra
     EXE_ARGS "--args ${BASELINE_FILE_ARG}"
     THREADS 1 ${SCREAM_TEST_MAX_THREADS} ${SCREAM_TEST_THREAD_INC}
-    LABELS "p3_sk;physics")
+    LABELS "p3_sk;physics;baseline_cmp")
 endif()
 
+# Note: the baseline_gen label label is really only used if SCREAM_ONLY_GENERATE_BASELINES=ON, but no harm adding it
 CreateUnitTest(p3_run_and_cmp "p3_run_and_cmp.cpp"
   LIBS p3 p3_test_infra
   EXCLUDE_MAIN_CPP
   THREADS ${SCREAM_TEST_MAX_THREADS}
   EXE_ARGS "${BASELINE_FILE_ARG}"
-  LABELS "p3;physics")
+  LABELS "p3;physics;baseline_gen;baseline_cmp")
 
 # Make sure that a diff from baselines triggers a failed test (in debug only)
 if (SCREAM_ENABLE_BASELINE_TESTS)
@@ -106,11 +112,3 @@ if (SCREAM_ENABLE_BASELINE_TESTS)
     EXCLUDE_MAIN_CPP
     ${FORCE_RUN_DIFF_FAILS})
 endif()
-
-# Note: the baseline_gen label label is really only used if SCREAM_ONLY_GENERATE_BASELINES=ON, but no harm adding it
-if (SCREAM_TEST_MAX_THREADS GREATER 1)
-  # ECUT only adds _ompX if we have more than one value of X, or if X>1
-  set (TEST_SUFFIX _omp${SCREAM_TEST_MAX_THREADS})
-endif()
-
-set_tests_properties (p3_run_and_cmp${TEST_SUFFIX} PROPERTIES LABELS "baseline_gen;cxx baseline_cmp")

From d86865e814ca6031063ac0ef3aa9a7e7fa7e8946 Mon Sep 17 00:00:00 2001
From: James Foucar <jgfouca@sandia.gov>
Date: Thu, 14 Nov 2024 11:30:51 -0700
Subject: [PATCH 2/2] Fix threads arg

---
 components/eamxx/src/physics/p3/tests/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/eamxx/src/physics/p3/tests/CMakeLists.txt b/components/eamxx/src/physics/p3/tests/CMakeLists.txt
index 9d2b2419c97..d705b30cc4e 100644
--- a/components/eamxx/src/physics/p3/tests/CMakeLists.txt
+++ b/components/eamxx/src/physics/p3/tests/CMakeLists.txt
@@ -55,11 +55,11 @@ if (SCREAM_ENABLE_BASELINE_TESTS)
     set(P3_THREADS "${SCREAM_TEST_MAX_THREADS}")
   else()
     set(BASELINE_FILE_ARG "-c -b ${SCREAM_BASELINES_DIR}/data")
-    set(P3_THREADS "1 ${SCREAM_TEST_MAX_THREADS} ${SCREAM_TEST_THREAD_INC}")
+    set(P3_THREADS 1 ${SCREAM_TEST_MAX_THREADS} ${SCREAM_TEST_THREAD_INC})
   endif()
 else()
   set(BASELINE_FILE_ARG "-n") # no baselines
-  set(P3_THREADS "1 ${SCREAM_TEST_MAX_THREADS} ${SCREAM_TEST_THREAD_INC}")
+  set(P3_THREADS 1 ${SCREAM_TEST_MAX_THREADS} ${SCREAM_TEST_THREAD_INC})
 endif()
 
 CreateUnitTest(p3_tests "${P3_TESTS_SRCS}"