updates to get convert_bufr_adpsfc ctests working

RussTreadon-NOAA · Dec 21, 2023 · b7640dc · b7640dc
1 parent d82da3d
commit b7640dc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/test/atm/CMakeLists.txt b/test/atm/CMakeLists.txt
@@ -4,7 +4,7 @@
 if (BUILD_GDASBUNDLE)
 
   # link input file from iodaconv to test directory
-  file(CREATE_LINK ${CMAKE_SOURCE_DIR}/sorc/iodaconv/test/testinput/gdas.t06z.adpsfc.tm00.bufr_d ${PROJECT_BINARY_DIR}/test/testdata/gdas.t06z.adpsfc.tm00.bufr_d SYMBOLIC)
+  file(CREATE_LINK ${CMAKE_SOURCE_DIR}/iodaconv/test/testinput/gdas.t06z.adpsfc.tm00.bufr_d ${PROJECT_BINARY_DIR}/test/testdata/gdas.t06z.adpsfc.tm00.bufr_d SYMBOLIC)
   # test convert BUFR to IODA
   add_test(NAME test_gdasapp_convert_bufr_adpsfc
            COMMAND ${CMAKE_BINARY_DIR}/bin/bufr2ioda.x ${PROJECT_BINARY_DIR}/test/testinput/bufr_adpsfc.yaml

diff --git a/test/land/CMakeLists.txt b/test/land/CMakeLists.txt
@@ -32,6 +32,6 @@ set_tests_properties(test_gdasapp_land_letkfoi_snowda
 
 # Test convert BUFR to IODA
 add_test(NAME test_gdasapp_convert_bufr_adpsfc_snow
-         COMMAND ${PROJECT_SOURCE_DIR}/test/land/test_bufr2ioda.sh ${PROJECT_BINARY_DIR} ${CMAKE_BINARY_DIR} bufr_adpsfc_snow
+         COMMAND ${PROJECT_SOURCE_DIR}/test/land/test_bufr2ioda.sh ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR} ${CMAKE_BINARY_DIR} bufr_adpsfc_snow
          WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/test/)
 
diff --git a/test/land/test_bufr2ioda.sh b/test/land/test_bufr2ioda.sh
@@ -3,10 +3,11 @@
 set -x
 
 PROJECT_BINARY_DIR=${1}
-CMAKE_BINARY_DIR=${1}
-OBSSOURCE=${3}
+PROJECT_SOURCE_DIR=${2}
+CMAKE_BINARY_DIR=${3}
+OBSSOURCE=${4}
 CMD=${CMAKE_BINARY_DIR}/bin/bufr2ioda.x
-OBSYAML=${PROJECT_BINARY_DIR}/../ush/land/${OBSSOURCE}.yaml
+OBSYAML=${PROJECT_SOURCE_DIR}/ush/land/${OBSSOURCE}.yaml
 
 OUTFILE=`grep obsdataout ${OBSYAML} | cut -d'"' -f2`