Unidata · WardF · Jan 22, 2020 · Jan 2, 2020 · Jan 3, 2020 · Jan 6, 2020
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -912,12 +912,6 @@ IF(ENABLE_TESTS)
     SET(SITE "${NC_CTEST_SITE}" CACHE STRING "")
   ENDIF()
 
-  # Create a CTestConfig file from the template.
-  CONFIGURE_FILE("${netCDF_SOURCE_DIR}/CTestConfig.cmake.in"
-    "${netCDF_BINARY_DIR}/CTestConfig.cmake"
-    @ONLY
-    )
-
   ###
   # This option dictates whether or not to turn on
   # tests which are known to fail.  This is not the
@@ -1993,6 +1987,7 @@ SET(TOPSRCDIR "${CMAKE_CURRENT_SOURCE_DIR}")
 SET(TOPBUILDDIR "${CMAKE_CURRENT_BINARY_DIR}")
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test_common.in ${CMAKE_CURRENT_BINARY_DIR}/test_common.sh @ONLY NEWLINE_STYLE LF)
 
+
 #####
 # Build nc_test4/findplugin.sh
 #####
@@ -2009,6 +2004,11 @@ ENDIF()
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ncdap_test/findtestserver.c.in ${CMAKE_CURRENT_SOURCE_DIR}/ncdap_test/findtestserver.c @ONLY NEWLINE_STYLE LF)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ncdap_test/findtestserver.c.in ${CMAKE_CURRENT_SOURCE_DIR}/dap4_test/findtestserver4.c @ONLY NEWLINE_STYLE LF)
 
+#####
+# Build dap4_test/pingurl4.c
+#####
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ncdap_test/pingurl.c ${CMAKE_CURRENT_SOURCE_DIR}/dap4_test/pingurl4.c @ONLY NEWLINE_STYLE LF)
+
 ####
 # Export files
 ####

diff --git a/configure.ac b/configure.ac
@@ -1507,6 +1507,7 @@ AC_CONFIG_FILES(nc_test4/findplugin.sh:nc_test4/findplugin.in)
 AC_CONFIG_FILES(examples/C/findplugin.sh:nc_test4/findplugin.in)
 AC_CONFIG_FILES(ncdap_test/findtestserver.c:ncdap_test/findtestserver.c.in)
 AC_CONFIG_FILES(dap4_test/findtestserver4.c:ncdap_test/findtestserver.c.in)
+AC_CONFIG_FILES(dap4_test/pingurl4.c:ncdap_test/pingurl.c)
 AC_CONFIG_FILES([nc_test4/run_par_test.sh], [chmod ugo+x nc_test4/run_par_test.sh])
 AC_CONFIG_FILES([nc_perf/run_par_bm_test.sh], [chmod ugo+x nc_perf/run_par_bm_test.sh])
 AC_CONFIG_FILES([examples/C/run_par_test.sh], [chmod ugo+x examples/C/run_par_test.sh])

diff --git a/ctest_scripts/README.md b/ctest_scripts/README.md
@@ -0,0 +1,3 @@
+# CTest Script Directory
+
+This directory contains ctest scripts which upload the results to the [NetCDF CDash Dashboard](https://cdash.unidata.ucar.edu).  These scripts require an environmental variable, `CDASH_TOKEN`, to submit results.  This is primarily a Unidata tool, but for users who want to submit results, a token can be requested by emailing support-netcdf@unidata.ucar.edu.
diff --git a/ctest_scripts/ctest_mpicc.ctest b/ctest_scripts/ctest_mpicc.ctest
@@ -0,0 +1,49 @@
+###
+# Standard CTest Script for testing netCDF.
+# Requires a CDash Token.
+#
+# Set the CDASH_TOKEN environmental variable.
+#
+###
+
+SET(CTEST_SOURCE_DIRECTORY "..")
+SET(CTEST_BINARY_DIRECTORY ".")
+
+set(CDASH_TOKEN $ENV{CDASH_TOKEN})
+MESSAGE("Using cdash token: ${CDASH_TOKEN}")
+
+
+SITE_NAME(local_site_name)
+set(CTEST_SITE ${local_site_name})
+
+set(CTEST_BUILD_CONFIGURATION "Profiling")
+set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
+set(CTEST_BUILD_NAME "default")
+set(CTEST_BUILD_CONFIGURATION "Profiling")
+set(CTEST_DROP_METHOD "https")
+set(CTEST_DROP_SITE_CDASH TRUE)
+set(CTEST_PROJECT_NAME netcdf-c)
+set(CTEST_COMPILER mpicc)
+
+find_program(CMAKE_COMMAND cmake)
+find_program(CTEST_GIT_COMMAND NAMES git)
+find_program(CTEST_COVERAGE_COMMAND NAMES gcov)
+find_program(CTEST_MEMORYCHECK_COMMAND NAMES valgrind)
+
+set(CTEST_BUILD_OPTIONS "-DENABLE_COVERAGE_TESTS=TRUE -DENABLE_ERANGE_FILL=TRUE -DENABLE_LOGGING=TRUE -DENABLE_BYTERANGE=TRUE -DENABLE_LARGE_FILE_TESTS=FALSE -DCMAKE_C_COMPILER=${CTEST_COMPILER}")
+
+
+set(CTEST_DROP_METHOD https)
+set(CTEST_DROP_SITE "cdash.unidata.ucar.edu:443")
+set(CTEST_DROP_LOCATION "/submit.php?project=netcdf-c")
+
+set(CTEST_CONFIGURE_COMMAND "${CMAKE_COMMAND} -DCMAKE_BUILD_TYPE:STRING=${CTEST_BUILD_CONFIGURATION} ${CTEST_BUILD_OPTIONS} ${CTEST_SOURCE_DIRECTORY}")
+
+ctest_start("Experimental")
+ctest_configure()
+ctest_build()
+ctest_test()
+ctest_coverage()
+if (NOT "${CDASH_TOKEN}" STREQUAL "")
+   ctest_submit(HTTPHEADER "Authorization: Bearer ${CDASH_TOKEN}")
+endif()
diff --git a/ctest_scripts/ctest_serial.ctest b/ctest_scripts/ctest_serial.ctest
@@ -0,0 +1,48 @@
+###
+# Standard CTest Script for testing netCDF.
+# Requires a CDash Token.
+#
+# Set the CDASH_TOKEN environmental variable.
+#
+###
+
+SET(CTEST_SOURCE_DIRECTORY "..")
+SET(CTEST_BINARY_DIRECTORY ".")
+
+set(CDASH_TOKEN $ENV{CDASH_TOKEN})
+MESSAGE("Using cdash token: ${CDASH_TOKEN}")
+
+
+SITE_NAME(local_site_name)
+set(CTEST_SITE ${local_site_name})
+
+set(CTEST_BUILD_CONFIGURATION "Profiling")
+set(CTEST_CMAKE_GENERATOR "Unix Makefiles")
+set(CTEST_BUILD_NAME "default")
+set(CTEST_BUILD_CONFIGURATION "Profiling")
+set(CTEST_DROP_METHOD "https")
+set(CTEST_DROP_SITE_CDASH TRUE)
+set(CTEST_PROJECT_NAME netcdf-c)
+
+find_program(CMAKE_COMMAND cmake)
+find_program(CTEST_GIT_COMMAND NAMES git)
+find_program(CTEST_COVERAGE_COMMAND NAMES gcov)
+find_program(CTEST_MEMORYCHECK_COMMAND NAMES valgrind)
+
+set(CTEST_BUILD_OPTIONS "-DENABLE_COVERAGE_TESTS=TRUE -DENABLE_ERANGE_FILL=TRUE -DENABLE_LOGGING=TRUE -DENABLE_BYTERANGE=TRUE -DENABLE_LARGE_FILE_TESTS=FALSE")
+
+
+set(CTEST_DROP_METHOD https)
+set(CTEST_DROP_SITE "cdash.unidata.ucar.edu:443")
+set(CTEST_DROP_LOCATION "/submit.php?project=netcdf-c")
+
+set(CTEST_CONFIGURE_COMMAND "${CMAKE_COMMAND} -DCMAKE_BUILD_TYPE:STRING=${CTEST_BUILD_CONFIGURATION} ${CTEST_BUILD_OPTIONS} ${CTEST_SOURCE_DIRECTORY}")
+
+ctest_start("Experimental")
+ctest_configure()
+ctest_build()
+ctest_test()
+ctest_coverage()
+if (NOT "${CDASH_TOKEN}" STREQUAL "")
+   ctest_submit(HTTPHEADER "Authorization: Bearer ${CDASH_TOKEN}")
+endif()
diff --git a/dap4_test/CMakeLists.txt b/dap4_test/CMakeLists.txt
@@ -26,6 +26,7 @@ IF(ENABLE_DAP_REMOTE_TESTS)
     # Change name (add '4') to avoid cmake
     # complaint about duplicate targets.
     BUILD_BIN_TEST(findtestserver4)
+    BUILD_BIN_TEST(pingurl4)
 ENDIF()
 
 IF(ENABLE_TESTS)

diff --git a/dap4_test/Makefile.am b/dap4_test/Makefile.am
@@ -46,8 +46,9 @@ test_data.log: test_meta.log
 if ENABLE_DAP_REMOTE_TESTS
 # Note: This program name was changed to findtestserver4
 # to avoid cmake complaint about duplicate targets.
-noinst_PROGRAMS = findtestserver4
+noinst_PROGRAMS = findtestserver4 pingurl4
 findtestserver4_SOURCES = findtestserver4.c
+pingurl4_SOURCES = pingurl4.c
 endif
 
 if ENABLE_DAP_REMOTE_TESTS

diff --git a/include/nc4internal.h b/include/nc4internal.h
@@ -210,9 +210,12 @@ typedef struct NC_VAR_INFO
     nc_bool_t dimscale;          /**< True if var is a dimscale */
     nc_bool_t *dimscale_attached;  /**< Array of flags that are true if dimscale is attached for that dim index */
     nc_bool_t deflate;           /**< True if var has deflate filter applied */
-    int deflate_level;
+    int deflate_level;           /**< If deflate is true, this is the deflate level, between 0 and 9. */
     nc_bool_t shuffle;           /**< True if var has shuffle filter applied */
     nc_bool_t fletcher32;        /**< True if var has fletcher32 filter applied */
+    nc_bool_t szip;              /**< True if szip filter is in use. */
+    int options_mask;            /**< Setting for szip filter, NC_SZIP_EC or NC_SZIP_NN. */
+    int pixels_per_block;        /**< Setting for szip filter, even and <= 32. */
     size_t chunk_cache_size, chunk_cache_nelems;
     float chunk_cache_preemption;
     void *format_var_info;       /**< Pointer to any binary format info. */

diff --git a/include/nc_tests.h b/include/nc_tests.h
@@ -18,12 +18,12 @@
 #include <string.h>
 #include <stdlib.h>
 #include "netcdf.h"
+#include "netcdf_filter.h"
 #include "nc_logging.h"
 #ifdef USE_PARALLEL
 #include "netcdf_par.h"
 #endif
 
-
 /** NC_MAX_DIMS for tests.  Allows different NC_MAX_DIMS values
  * without breaking this test with a heap or stack overflow. */
 #define NC_TESTS_MAX_DIMS 1024

diff --git a/include/nctestserver.h b/include/nctestserver.h
@@ -9,6 +9,9 @@ See \ref copyright file for more info.
 
 */
 
+#ifndef NCTESTSERVER_H
+#define NCTESTSERVER_H 1
+
 #include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
@@ -18,6 +21,8 @@ See \ref copyright file for more info.
 
 #undef FINDTESTSERVER_DEBUG
 
+enum KIND {NOKIND, DAP2KIND, DAP4KIND, THREDDSKIND};
+
 #define MAXSERVERURL 4096
 #define TIMEOUT 10 /*seconds*/
 #define BUFSIZE 8192 /*bytes*/
@@ -28,6 +33,7 @@ See \ref copyright file for more info.
 #endif
 
 static int ping(const char* url);
+static int timedping(const char* url, long timeout);
 
 static char**
 parseServers(const char* remotetestservers)
@@ -73,8 +79,8 @@ This indicates that the server is up and running.
 Return the complete url for the server plus the path.
 */
 
-static char*
-nc_findtestserver(const char* path, int isdap4, const char* serverlist)
+char*
+nc_findtestserver(const char* path, const char* serverlist)
 {
     char** svclist;
     char** svc;
@@ -153,8 +159,15 @@ WriteMemoryCallback(void *ptr, size_t size, size_t nmemb, void *data)
 See if a server is responding.
 Return NC_ECURL if the ping fails, NC_NOERR otherwise
 */
+
 static int
 ping(const char* url)
+{
+    return timedping(url,TIMEOUT);
+}
+
+static int
+timedping(const char* url, long timeout)
 {
     int stat = NC_NOERR;
     CURLcode cstat = CURLE_OK;
@@ -172,7 +185,7 @@ ping(const char* url)
     CERR((curl_easy_setopt(curl, CURLOPT_FOLLOWLOCATION, 1L)));
 
     /* use a very short timeout: 10 seconds */
-    CERR((curl_easy_setopt(curl, CURLOPT_TIMEOUT, (long)TIMEOUT)));
+    CERR((curl_easy_setopt(curl, CURLOPT_TIMEOUT, (long)timeout)));
 
     /* fail on HTTP 400 code errors */
     CERR((curl_easy_setopt(curl, CURLOPT_FAILONERROR, (long)1)));
@@ -210,3 +223,4 @@ ping(const char* url)
         curl_easy_cleanup(curl);
     return stat;
 }
+#endif /*NCTESTSERVER_H*/
diff --git a/include/netcdf_filter.h b/include/netcdf_filter.h
@@ -18,6 +18,9 @@
 #define H5Z_FILTER_SZIP 4
 #endif
 
+#define NC_SZIP_EC 4  /**< Selects entropy coding method for szip. */
+#define NC_SZIP_NN 32 /**< Selects nearest neighbor coding method for szip. */
+
 /* Define the known filter formats */
 #define NC_FILTER_FORMAT_HDF5 1 /* Use the H5Z_class2_t format */
 
@@ -51,6 +54,9 @@ EXTERNL int nc_filter_register(NC_FILTER_INFO* filter_info);
 EXTERNL int nc_filter_unregister(int format, int id);
 EXTERNL int nc_filter_inq(int format, int id, NC_FILTER_INFO* filter_info);
 
+/* Set szip compression for a variable. */
+EXTERNL int nc_def_var_szip(int ncid, int varid, int options_mask, int pixels_per_block);
+
 #if defined(__cplusplus)
 }
 #endif

diff --git a/libdispatch/CMakeLists.txt b/libdispatch/CMakeLists.txt
@@ -18,8 +18,13 @@ IF(ENABLE_BYTERANGE)
 ENDIF(ENABLE_BYTERANGE)
 
 add_library(dispatch OBJECT ${libdispatch_SOURCES})
-target_include_directories(dispatch PUBLIC ${MPI_C_INCLUDE_PATH})
-target_link_libraries(dispatch PUBLIC ${MPI_C_LIBRARIES})
+IF(MPI_C_INCLUDE_PATH)
+    target_include_directories(dispatch PUBLIC ${MPI_C_INCLUDE_PATH})
+ENDIF(MPI_C_INCLUDE_PATH)
+
+IF(MPI_C_LIBRARIES)
+    target_link_libraries(dispatch PUBLIC ${MPI_C_LIBRARIES})
+ENDIF(MPI_C_LIBRARIES)
 
 FILE(GLOB CUR_EXTRA_DIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.h ${CMAKE_CURRENT_SOURCE_DIR}/*.c)
 SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# CTest Script Directory

		This directory contains ctest scripts which upload the results to the [NetCDF CDash Dashboard](https://cdash.unidata.ucar.edu). These scripts require an environmental variable, `CDASH_TOKEN`, to submit results. This is primarily a Unidata tool, but for users who want to submit results, a token can be requested by emailing support-netcdf@unidata.ucar.edu.