Merge branch 'master' into ejh_more_tests

.travis.yml

@@ -36,4 +36,4 @@ before_install:
 
 script:
 
-    - docker run --rm -it -h "$CURHOST" -e USEDASH=FALSE -e RUNF=OFF -e RUNCXX=OFF -e RUNP=OFF -e RUNNCO=OFF -e USECMAKE=$USECMAKE -e USEAC=$USEAC -e DISTCHECK=$DISTCHECK -e COPTS="$COPTS" -e AC_OPTS="$AC_OPTS" -e CTEST_OUTPUT_ON_FAILURE=1 -v $(pwd):/netcdf-c -e TESTPROC=8 $DOCKIMG
+    - docker run --rm -it -h "$CURHOST" -e USEDASH=FALSE -e RUNF=OFF -e RUNCXX=OFF -e RUNP=OFF -e RUNNCO=OFF -e USECMAKE=$USECMAKE -e USEAC=$USEAC -e DISTCHECK=$DISTCHECK -e COPTS="$COPTS" -e AC_OPTS="$AC_OPTS" -e CTEST_OUTPUT_ON_FAILURE=1 -v $(pwd):/netcdf-c -e TESTPROC=100 $DOCKIMG

nc_test/Makefile.am

@@ -12,6 +12,10 @@ AM_CPPFLAGS += -DTOPBINDIR=${abs_top_bindir}
 LDADD = ${top_builddir}/liblib/libnetcdf.la
 AM_CPPFLAGS += -I$(top_builddir)/liblib -I$(top_builddir)/include -I$(top_srcdir)/libsrc
 
+
+# Note which tests depend on other tests. necessary for make -j check
+TEST_EXTENSIONS = .sh
+
 # These are the tests which are always run.
 TESTPROGRAMS = t_nc tst_small nc_test tst_misc tst_norm tst_names       \
 tst_nofill tst_nofill2 tst_nofill3 tst_atts3 tst_meta tst_inq_type      \
@@ -68,6 +72,7 @@ if BUILD_DISKLESS
 TESTS += run_diskless.sh run_diskless5.sh
 if BUILD_MMAP
 TESTS += run_mmap.sh
+run_mmap.log: run_diskless.log
 endif
 if LARGE_FILE_TESTS
 TESTS += run_diskless2.sh

nc_test/run_diskless.sh

@@ -117,4 +117,4 @@ diff tst_diskless3_file.cdl tst_diskless3_memory.cdl
 # cleanup
 rm -f $FILE3 tst_diskless3_file.cdl tst_diskless3_memory.cdl
 
-exit
+exit 0

nc_test4/CMakeLists.txt

@@ -88,6 +88,7 @@ IF(USE_HDF4_FILE_TESTS AND NOT MSVC)
     add_sh_test(nc_test4 run_chunk_hdf4)
     add_bin_test(nc_test4 tst_h4_lendian)
     add_sh_test(nc_test4 tst_hdf4_read_var)
+    SET_TESTS_PROPERTIES(nc_test4_tst_hdf4_read_var PROPERTIES DEPENDS tst_interops2)
 ENDIF()
 
 IF(TEST_PARALLEL4)

nc_test4/Makefile.am

@@ -3,11 +3,14 @@
 # See COPYRIGHT file for conditions of use.
 #
 # This entire directory will be skipped if netCDF-4 is not enabled.
-# Ed Hartnett
+# Ed Hartnett, Ward Fisher
 
 # Put together AM_CPPFLAGS and AM_LDFLAGS.
 include $(top_srcdir)/lib_flags.am
 
+# Note which tests depend on other tests. necessary for make -j check
+TEST_EXTENSIONS = .sh
+
 # Link to our assembled library.
 AM_LDFLAGS += ${top_builddir}/liblib/libnetcdf.la
 
@@ -93,13 +96,16 @@ check_PROGRAMS += tst_interops2 tst_chunk_hdf4 tst_h4_lendian
 
 if BUILD_UTILITIES
 # This test script depends on ncdump.
-TESTS += tst_formatx_hdf4.sh 
+TESTS += tst_formatx_hdf4.sh
 endif # BUILD_UTILITIES
 
 TESTS += run_chunk_hdf4.sh tst_h4_lendian
 if USE_HDF4_FILE_TESTS
 check_PROGRAMS += tst_interops3
 TESTS += run_get_hdf4_files.sh tst_hdf4_read_var.sh
+
+tst_hdf4_read_var.log: tst_interops2.log
+
 endif # USE_HDF4_FILE_TESTS
 endif # USE_HDF4
 

ncdump/CMakeLists.txt

@@ -121,6 +121,8 @@ ENDIF()
   ENDIF(USE_STRICT_NULL_BYTE_HEADER_PADDING)
 
   add_sh_test(ncdump tst_nccopy3)
+  SET_TESTS_PROPERTIES(ncdump_tst_nccopy3 PROPERTIES RUN_SERIAL TRUE)
+
   add_sh_test(ncdump tst_nccopy3_subset)
   add_sh_test(ncdump tst_charfill)