update fixes for -n and -b

ulmononian · Oct 2, 2024 · e69a80d · e69a80d
1 parent b599e33
commit e69a80d
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/tests-dev/ufs_test.sh b/tests-dev/ufs_test.sh
@@ -86,6 +86,7 @@ ACCNR=${ACCNR:-""}
 UFS_TEST_YAML="ufs_test.yaml"
 export UFS_TEST_YAML
 LINK_TESTS=false
+TEST_TEMP_YAML=false
 
 while getopts ":a:b:cl:mn:dwkreohs" opt; do
   case ${opt} in
@@ -95,9 +96,6 @@ while getopts ":a:b:cl:mn:dwkreohs" opt; do
     b)
 	NEW_BASELINES_FILE=${OPTARG}
 	export NEW_BASELINES_FILE
-	python -c "import ufs_test_utils; ufs_test_utils.update_testyaml_b()"
-	UFS_TEST_YAML="ufs_test_temp.yaml"
-	export UFS_TEST_YAML
 	;;
     c)
 	CREATE_BASELINE=true
@@ -132,9 +130,7 @@ while getopts ":a:b:cl:mn:dwkreohs" opt; do
 
 	export SRT_NAME
 	export SRT_COMPILER
-	python -c "import ufs_test_utils; ufs_test_utils.update_testyaml_n()"
-	UFS_TEST_YAML="ufs_test_temp.yaml"
-	export UFS_TEST_YAML
+	TEST_TEMP_YAML=true
 	;;
     d)
 	export delete_rundir=true
@@ -193,6 +189,18 @@ else
     exit 1
 fi
 
+if [[ ! ${NEW_BASELINES_FILE} == '' ]]; then
+    python -c "import ufs_test_utils; ufs_test_utils.update_testyaml_b()"
+    UFS_TEST_YAML="ufs_test_temp.yaml"
+    export UFS_TEST_YAML
+fi
+
+if [[ ${TEST_TEMP_YAML} == true ]]; then        
+    python -c "import ufs_test_utils; ufs_test_utils.update_testyaml_n()"
+    UFS_TEST_YAML="ufs_test_temp.yaml"
+    export UFS_TEST_YAML
+fi
+
 # If -s; link sharable test scripts from tests directory
 if [[ ${LINK_TESTS} == true ]]; then
     if ! python -c "import ufs_test_utils; ufs_test_utils.sync_testscripts()"