From 59f9ab70c0ced504229f848c1d05c412c12f4722 Mon Sep 17 00:00:00 2001
From: Cory Martin <cory.r.martin@noaa.gov>
Date: Tue, 16 Apr 2024 17:01:49 -0400
Subject: [PATCH 1/3] Orion fix

---
 modulefiles/GDAS/orion.intel.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modulefiles/GDAS/orion.intel.lua b/modulefiles/GDAS/orion.intel.lua
index b5550f25c..7f5038ac5 100644
--- a/modulefiles/GDAS/orion.intel.lua
+++ b/modulefiles/GDAS/orion.intel.lua
@@ -80,6 +80,7 @@ setenv('MPIEXEC_NPROC', mpinproc)
 
 setenv("CRTM_FIX","/work2/noaa/da/cmartin/GDASApp/fix/crtm/2.4.0")
 setenv("GDASAPP_TESTDATA","/work2/noaa/da/cmartin/CI/GDASApp/data")
+setenv("GDASAPP_UNIT_TEST_DATA_PATH", "/work2/noaa/da/cmartin/CI/GDASApp/data/test/")
 prepend_path("PATH","/apps/contrib/NCEP/libs/hpc-stack/intel-2018.4/prod_util/1.2.2/bin")
 
 execute{cmd="ulimit -s unlimited",modeA={"load"}}

From 69a605c5fca1a7c7705769527449cd9a69114788 Mon Sep 17 00:00:00 2001
From: Cory Martin <cory.r.martin@noaa.gov>
Date: Tue, 16 Apr 2024 16:22:11 -0400
Subject: [PATCH 2/3] See if this fixes hera/orion

---
 modulefiles/GDAS/hera.intel.lua     |  1 +
 modulefiles/GDAS/hercules.intel.lua |  1 +
 test/CMakeLists.txt                 | 27 +++++++++++++++------------
 3 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/modulefiles/GDAS/hera.intel.lua b/modulefiles/GDAS/hera.intel.lua
index 73d07f774..d8e389058 100644
--- a/modulefiles/GDAS/hera.intel.lua
+++ b/modulefiles/GDAS/hera.intel.lua
@@ -88,6 +88,7 @@ setenv('MPIEXEC_NPROC', mpinproc)
 
 setenv("CRTM_FIX","/scratch1/NCEPDEV/da/Cory.R.Martin/GDASApp/fix/crtm/2.4.0")
 setenv("GDASAPP_TESTDATA","/scratch1/NCEPDEV/da/Cory.R.Martin/CI/GDASApp/data")
+setenv("GDASAPP_UNIT_TEST_DATA_PATH", "/scratch1/NCEPDEV/da/Cory.R.Martin/CI/GDASApp/data/test")
 --prepend_path("PATH","/scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/intel-18.0.5.274/prod_util/1.2.2/bin")
 
 whatis("Name: ".. pkgName)
diff --git a/modulefiles/GDAS/hercules.intel.lua b/modulefiles/GDAS/hercules.intel.lua
index 2222679da..0042d6075 100644
--- a/modulefiles/GDAS/hercules.intel.lua
+++ b/modulefiles/GDAS/hercules.intel.lua
@@ -81,6 +81,7 @@ setenv('MPIEXEC_NPROC', mpinproc)
 
 setenv("CRTM_FIX","/work2/noaa/da/cmartin/GDASApp/fix/crtm/2.4.0")
 setenv("GDASAPP_TESTDATA","/work2/noaa/da/cmartin/CI/GDASApp/data")
+setenv("GDASAPP_UNIT_TEST_DATA_PATH", "/work2/noaa/da/cmartin/CI/GDASApp/data/test/")
 prepend_path("PATH","/apps/contrib/NCEP/libs/hpc-stack/intel-2018.4/prod_util/1.2.2/bin")
 
 execute{cmd="ulimit -s unlimited",modeA={"load"}}
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 6786486c2..c399e5bcb 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -4,20 +4,23 @@ set(URL "https://ftp.emc.ncep.noaa.gov/static_files/public/GDASApp")
 set(SHA "bda76f96666405f72abef56ad4d7d5b93ca153cd7d675853fbdb199096949f8a")
 string(SUBSTRING ${SHA} 0 6 SHORTSHA)
 set(TAR "gdasapp-fix-${SHORTSHA}.tgz")
-# download test files
-file(DOWNLOAD
-  ${URL}/${TAR}
-  ${CMAKE_CURRENT_BINARY_DIR}/${TAR}
-  INACTIVITY_TIMEOUT 30
-  TIMEOUT 90
-  SHOW_PROGRESS
-  STATUS status
-  EXPECTED_HASH SHA256=${SHA}
-  )
-# Extract downloaded tarball.
+IF(DEFINED ENV{GDASAPP_UNIT_TEST_DATA_PATH})
+  file(COPY ENV{GDASAPP_UNIT_TEST_DATA_PATH}/${TAR} ${CMAKE_CURRENT_BINARY_DIR}/${TAR})
+ELSE()
+  # download test files
+  file(DOWNLOAD
+    ${URL}/${TAR}
+    ${CMAKE_CURRENT_BINARY_DIR}/${TAR}
+    INACTIVITY_TIMEOUT 30
+    TIMEOUT 90
+    SHOW_PROGRESS
+    STATUS status
+    EXPECTED_HASH SHA256=${SHA}
+    )
+ENDIF()
+# Extract tarball.
 file(ARCHIVE_EXTRACT INPUT ${CMAKE_CURRENT_BINARY_DIR}/${TAR}
   DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
-
 # list of test binary/data files to install
 list(APPEND test_data
   ${CMAKE_CURRENT_BINARY_DIR}/testdata/atminc_compress.nc4

From 59eeda9f1531d902c1151f84ababcdc5e1f22b1a Mon Sep 17 00:00:00 2001
From: CoryMartin-NOAA <cory.r.martin@noaa.gov>
Date: Tue, 16 Apr 2024 20:50:53 +0000
Subject: [PATCH 3/3] working

---
 test/CMakeLists.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index c399e5bcb..86b53a3f1 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -5,7 +5,8 @@ set(SHA "bda76f96666405f72abef56ad4d7d5b93ca153cd7d675853fbdb199096949f8a")
 string(SUBSTRING ${SHA} 0 6 SHORTSHA)
 set(TAR "gdasapp-fix-${SHORTSHA}.tgz")
 IF(DEFINED ENV{GDASAPP_UNIT_TEST_DATA_PATH})
-  file(COPY ENV{GDASAPP_UNIT_TEST_DATA_PATH}/${TAR} ${CMAKE_CURRENT_BINARY_DIR}/${TAR})
+  set(GDASAPP_UNIT_TEST_DATA_PATH "$ENV{GDASAPP_UNIT_TEST_DATA_PATH}")
+  file(COPY ${GDASAPP_UNIT_TEST_DATA_PATH}/${TAR} DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
 ELSE()
   # download test files
   file(DOWNLOAD