correct errors is gw-rt implementation of run_jedi_exe ctests (#223)

NOAA-EMC · Feb 3, 2023 · 221a99d · 221a99d
1 parent 0b5676c
commit 221a99d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/test/atm/global-workflow/CMakeLists.txt b/test/atm/global-workflow/CMakeLists.txt
@@ -39,18 +39,18 @@ add_test(NAME test_gdasapp_atm_jjob_ens_post
 # run_jedi_exe ctests do not require g-w.  place here due to longer run time
 # test for ush/run_jedi_exe.py 3dhofx
 add_test(NAME test_gdasapp_run_jedi_exe_3dhofx
-  COMMAND ${PROJECT_SOURCE_DIR}/test/run_jedi_exe_3dhofx.sh
+  COMMAND ${PROJECT_SOURCE_DIR}/test/atm/global-workflow/run_jedi_exe_3dhofx.sh
           ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}
-  WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/test/)
+  WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/test/atm/global-workflow/testrun)
 
 # test for ush/run_jedi_exe.py 3dvar
 add_test(NAME test_gdasapp_run_jedi_exe_3dvar
-  COMMAND ${PROJECT_SOURCE_DIR}/test/run_jedi_exe_3dvar.sh
+  COMMAND ${PROJECT_SOURCE_DIR}/test/atm/global-workflow/run_jedi_exe_3dvar.sh
           ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}
-  WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/test/)
+  WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/test/atm/global-workflow/testrun)
 
 # test for ush/run_jedi_exe.py letkf
 add_test(NAME test_gdasapp_run_jedi_exe_letkf
-  COMMAND ${PROJECT_SOURCE_DIR}/test/run_jedi_exe_letkf.sh
+  COMMAND ${PROJECT_SOURCE_DIR}/test/atm/global-workflow/run_jedi_exe_letkf.sh
           ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}
-  WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/test/)
+  WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/test/atm/global-workflow/testrun)
diff --git a/test/atm/global-workflow/run_jedi_exe_3dhofx.sh b/test/atm/global-workflow/run_jedi_exe_3dhofx.sh
@@ -19,8 +19,8 @@ module load GDAS/${machine}
 set -x
 module list
 
-mkdir -p ${bindir}/test/testoutput/gdas_single_test_hofx3d
-cd ${bindir}/test/testoutput/gdas_single_test_hofx3d
+mkdir -p ${bindir}/test/atm/global-workflow/testrun/gdas_single_test_hofx3d
+cd ${bindir}/test/atm/global-workflow/testrun/gdas_single_test_hofx3d
 
 cat > ./3dhofx_example.yaml << EOF
 working directory: ./

diff --git a/test/atm/global-workflow/run_jedi_exe_3dvar.sh b/test/atm/global-workflow/run_jedi_exe_3dvar.sh
@@ -20,8 +20,8 @@ set -x
 module list
 
 
-mkdir -p ${bindir}/test/testoutput/gdas_single_test_3dvar
-cd ${bindir}/test/testoutput/gdas_single_test_3dvar
+mkdir -p ${bindir}/test/atm/global-workflow/testrun/gdas_single_test_3dvar
+cd ${bindir}/test/atm/global-workflow/testrun/gdas_single_test_3dvar
 
 cat > ./3dvar_example.yaml << EOF
 working directory: ./

diff --git a/test/atm/global-workflow/run_jedi_exe_letkf.sh b/test/atm/global-workflow/run_jedi_exe_letkf.sh
@@ -25,8 +25,8 @@ elif [ "$machine" = "orion" ]; then
     cominges="/work2/noaa/da/rtreadon/GDASApp/cases"
 fi
 
-mkdir -p ${bindir}/test/testoutput/gdas_single_test_letkf
-cd ${bindir}/test/testoutput/gdas_single_test_letkf
+mkdir -p ${bindir}/test/atm/global-workflow/testrun/gdas_single_test_letkf
+cd ${bindir}/test/atm/global-workflow/testrun/gdas_single_test_letkf
 
 cat > ./letkf_example.yaml << EOF
 working directory: ./