Attempt at test orchestration to avoid a race condition when running tests in parallel.

ncdap_test/CMakeLists.txt

@@ -35,7 +35,8 @@ IF(ENABLE_TESTS)
   IF(BUILD_UTILITIES)
     add_sh_test(ncdap tst_ncdap3)
     add_sh_test(ncdap testpathcvt)
-  ENDIF()
+    SET_TESTS_PROPERTIES(ncdap_tst_ncdap3 ncdap_testpathcvt PROPERTIES RUN_SERIAL TRUE)
+ENDIF()
 
   IF(NOT MSVC)
     add_bin_env_test(ncdap t_dap3a)
@@ -55,8 +56,11 @@ IF(ENABLE_TESTS)
       IF(ENABLE_DAP_LONG_TESTS)
         add_sh_test(ncdap tst_longremote3)
         add_bin_test(ncdap test_manyurls)
+        SET_TESTS_PROPERTIES(ncdap_tst_longremote3 ncdap_test_manyurls PROPERTIES RUN_SERIAL TRUE)
       ENDIF(ENABLE_DAP_LONG_TESTS)
 
+      SET_TESTS_PROPERTIES(ncdap_tst_remote3 PROPERTIES RUN_SERIAL TRUE)
+
     ENDIF(BUILD_UTILITIES)
 
     IF(ENABLE_DAP_AUTH_TESTS)

ncdap_test/Makefile.am

@@ -56,8 +56,10 @@ TESTS += test_partvar
 
 if ENABLE_DAP_LONG_TESTS
  TESTS += tst_longremote3.sh
+ tst_longremote3.log: tst_remote3.log
  check_PROGRAMS += test_manyurls
  TESTS += test_manyurls
+ test_manyurls.log: tst_longremote3.log
 endif
 
 test_partvar_SOURCES = test_partvar.c
@@ -92,7 +94,7 @@ SUBDIRS = testdata3 expected3 expectremote3
 EXTRA_DIST = tst_ncdap3.sh  \
              tst_remote3.sh \
              tst_longremote3.sh \
-  	     tst_zero_len_var.sh \
+	     tst_zero_len_var.sh \
              tst_filelists.sh tst_urls.sh tst_utils.sh \
 	     t_dap.c CMakeLists.txt tst_formatx.sh testauth.sh testurl.sh \
 	     t_ncf330.c tst_ber.sh tst_fillmismatch.sh tst_encode.sh testpathcvt.sh \

ncdap_test/tst_ncdap.sh

@@ -51,7 +51,7 @@ VALGRIND="valgrind -q --error-exitcode=2 --leak-check=full"
 fi
 
 rm -fr ${RESULTSDIR}
-mkdir "${RESULTSDIR}"
+mkdir -p "${RESULTSDIR}"
 
 rm -f ./.dodsrc ./.ocrc ./.daprc
 passcount=0

ncdap_test/tst_ncdap3.sh

@@ -34,7 +34,7 @@ EXPECTED="$expected3"
 RESULTSDIR="file_results"
 
 rm -fr ${RESULTSDIR}
-mkdir "${RESULTSDIR}"
+mkdir -p "${RESULTSDIR}"
 
 echo "*** Testing $TITLE "
 echo "        Base URL: ${TESTURL}"

ncdap_test/tst_remote.sh

@@ -195,7 +195,7 @@ fi
 if test "x$timing" = "x1" ; then TIMECMD="time"; else TIMECMD=""; fi
 
 rm -fr ${RESULTSDIR}
-mkdir "${RESULTSDIR}"
+mkdir -p "${RESULTSDIR}"
 
 passcount=0
 xfailcount=0

ncdap_test/tst_remote3.sh

@@ -26,7 +26,7 @@ EXPECTED="$expected3"
 RESULTSDIR="remote_results"
 
 rm -fr ${RESULTSDIR}
-mkdir "${RESULTSDIR}"
+mkdir -p "${RESULTSDIR}"
 
 echo "*** Testing $TITLE "
 echo "        Base URL: ${DTS}"

ncdap_test/tst_special.sh

@@ -69,7 +69,7 @@ VALGRIND="valgrind -q --error-exitcode=2 --leak-check=full"
 fi
 
 rm -fr ${RESULTSDIR}
-mkdir "${RESULTSDIR}"
+mkdir -p "${RESULTSDIR}"
 
 passcount=0
 xfailcount=0

ncdap_test/tst_tds.sh

@@ -96,7 +96,7 @@ VALGRIND="valgrind -q --error-exitcode=2 --leak-check=full"
 fi
 
 rm -fr ${RESULTSDIR}
-mkdir "${RESULTSDIR}"
+mkdir -p "${RESULTSDIR}"
 
 passcount=0
 xfailcount=0