1. Any test that references nctestserver/NC_findtestserver

   should be under ENABLE_DAP_REMOTE_TESTS.
   Fixed to make sure that this is so.
   Also attempted to fix ncdap_test/CMakeLists.txt,
   but probably got it wrong.
   HT to Nico Schlomer.
2. Attempted to reduce the number of conversion errors
   when -Wconversion is set. Fixed oc2, but
   rest of netcdf remains to be done.
   HT to Nico Schlomer.
3. When doing #2, I discovered an error in ncgen.y
   that has remained hidden. This required some other
   test case fixes.

Author: dmh

cf

@@ -16,6 +16,10 @@ DAP=1
 #M32=1
 #M64=1
 
+CFLAGS=""
+#CFLAGS="-Wall -Wno-unused-variable -Wno-unused-parameter -Wconversion ${CFLAGS}"
+#CFLAGS="-Wall -Wno-unused-variable -Wno-unused-parameter ${CFLAGS}"
+
 FORCE="-i"
 
 #INSTALL=1

libdispatch/ddispatch.c

@@ -65,6 +65,7 @@ const char*
 NC_findtestserver(const char* path)
 {
 #ifdef USE_DAP
+#ifdef ENABLE_DAP_REMOTE_TESTS
     /* NCDAP_ping is defined in libdap2/ncdap3.c */
     const char** svc;
     if(path == NULL) path = "";
@@ -79,6 +80,7 @@ NC_findtestserver(const char* path)
 	if(stat == NC_NOERR)
 	    return *svc;
     }
+#endif
 #endif
     return NULL;
 }

libdispatch/nctime.c

@@ -50,7 +50,7 @@ cdTrim(char* s, int n)
 
 	if(s==NULL)
 		return;
-	for(c=s; *c && c<s+n-1 && !isspace(*c); c++);
+	for(c=s; *c && c<s+n-1 && !isspace((int)*c); c++);
 	*c='\0';
 	return;
 }

ncdap_test/CMakeLists.txt

@@ -12,8 +12,10 @@ FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.sh)
 
 FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/ FILE_PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE) 
 
-ADD_EXECUTABLE(nctestserver nctestserver.c)
-TARGET_LINK_LIBRARIES(nctestserver netcdf ${ALL_TLL_LIBS})
+IF(ENABLE_DAP_REMOTE_TESTS)
+	ADD_EXECUTABLE(nctestserver nctestserver.c)
+	TARGET_LINK_LIBRARIES(nctestserver netcdf ${ALL_TLL_LIBS})
+ENDIF()
 
 IF(ENABLE_TESTS)
 	# Base tests
@@ -24,29 +26,26 @@ IF(ENABLE_TESTS)
 
 	add_sh_test(ncdap tst_ncdap3)
 
-	IF(ENABLE_DAP_REMOTE_TESTS)
-		add_sh_test(ncdap tst_remote3)
-		add_sh_test(ncdap tst_formatx)
-	ENDIF()
-
-	IF(ENABLE_DAP_LONG_TESTS)
-		add_sh_test(ncdap tst_longremote3)
-	ENDIF()
-
 	IF(NOT MSVC)
 		add_bin_env_test(ncdap t_dap3a)
 		add_bin_env_test(ncdap test_cvt)
 		add_bin_env_test(ncdap test_vara)
 	ENDIF()
-	add_bin_test(ncdap test_nstride_cached)
-	add_bin_test(ncdap test_partvar)
-	add_bin_test(ncdap t_misc)
 
-	IF(ENABLE_DAP_AUTH_TESTS)
-	  add_bin_test(ncdap t_auth)
-	ENDIF()
+	IF(ENABLE_DAP_REMOTE_TESTS)
+		add_sh_test(ncdap tst_remote3)
+		add_sh_test(ncdap tst_formatx)
+		add_bin_test(ncdap test_partvar)
+		IF(ENABLE_DAP_LONG_TESTS)
+			add_sh_test(ncdap tst_longremote3)
+		ENDIF()
 
+		add_bin_test(ncdap test_nstride_cached)
+		add_bin_test(ncdap t_misc)
 
+		IF(ENABLE_DAP_AUTH_TESTS)
+		  add_bin_test(ncdap t_auth)
+		ENDIF()
 
 # test_varm3 did not survive the transition
 # to remotetest.unidata.ucar.edu; the
@@ -55,6 +54,8 @@ IF(ENABLE_TESTS)
 # and put it in testdods directory on remotetest.
 #	add_bin_test(ncdap test_varm3)
 
+	ENDIF()
+
 ENDIF()
 ADD_SUBDIRECTORY(testdata3)
 ADD_SUBDIRECTORY(expected3)

ncdap_test/Makefile.am

@@ -14,38 +14,40 @@ check_PROGRAMS =
 TESTS = 
 TESTS_ENVIRONMENT=TOPSRCDIR=${abs_top_srcdir}
 
-# Make nctestserver be the first test to be built
-check_PROGRAMS += nctestserver
-nctestserver_SOURCES = nctestserver.c
-
 TESTS += tst_ncdap3.sh
 
+t_dap3a_SOURCES = t_dap3a.c
+test_cvt3_SOURCES = test_cvt.c
+test_vara_SOURCES = test_vara.c
+
+check_PROGRAMS += t_dap3a test_cvt3 test_vara
+
+TESTS += t_dap3a test_cvt3 test_vara
+
 # remote tests are optional
 # because the server may be down or inaccessible
 
 if ENABLE_DAP_REMOTE_TESTS
 
-TESTS += tst_remote3.sh tst_formatx.sh
+# Make nctestserver be the first test to be built
+check_PROGRAMS += nctestserver
+nctestserver_SOURCES = nctestserver.c
+
+TESTS += tst_remote3.sh tst_formatx.sh test_partvar
 
 if ENABLE_DAP_LONG_TESTS
  TESTS += tst_longremote3.sh
 endif
 
-test_cvt3_SOURCES = test_cvt.c
-test_vara_SOURCES = test_vara.c
 test_partvar_SOURCES = test_partvar.c
-t_dap3a_SOURCES = t_dap3a.c
 test_nstride_cached_SOURCE = test_nstride_cached.c
 t_auth_SOURCES = t_auth.c
 t_misc_SOURCES = t_misc.c
 
-TESTS += t_dap3a test_cvt3 test_vara test_partvar
-TESTS += t_dap3a
 TESTS += test_nstride_cached
 TESTS += t_misc
 
-check_PROGRAMS += t_dap3a test_cvt3 test_vara test_partvar
-check_PROGRAMS += t_dap3a
+check_PROGRAMS += test_partvar
 check_PROGRAMS += test_nstride_cached
 check_PROGRAMS += t_misc
 

ncdump/CMakeLists.txt

@@ -36,8 +36,10 @@ ADD_EXECUTABLE(nccopy ${nccopy_FILES})
 TARGET_LINK_LIBRARIES(ncdump netcdf ${ALL_TLL_LIBS})
 TARGET_LINK_LIBRARIES(nccopy netcdf ${ALL_TLL_LIBS})
 
+ADD_EXECUTABLE(bom bom.c)
+
 IF(ENABLE_TESTS)
-	ADD_EXECUTABLE(rewrite-scalar rewrite-scalar.c bom.c)
+	ADD_EXECUTABLE(rewrite-scalar rewrite-scalar.c)
 	TARGET_LINK_LIBRARIES(rewrite-scalar netcdf)
 	# Base tests
 	# The tests are set up as a combination of shell scripts and executables that

ncdump/bom.c

@@ -6,6 +6,7 @@
 #include <config.h>
 #include <stdlib.h>
 #include <stdio.h>
+#include <string.h>
 
 /* BOM Sequences */
 static char* U8   = "\xEF\xBB\xBF";    /* UTF-8 */
@@ -18,7 +19,7 @@ int
 main(int argc, char** argv)
 {
     char* bom = U8;
-    int bomlen = 3;
+    size_t bomlen = 3;
     if(argc > 1 && strlen(argv[1]) > 0) {
 	char* which = argv[1];
 	switch (which[0]) {
@@ -30,4 +31,3 @@ main(int argc, char** argv)
     fwrite(bom,1,bomlen,stdout);
     exit(0);
 }
-

ncdump/ncdump.c

@@ -1944,7 +1944,7 @@ main(int argc, char *argv[])
 	  break;
 	case 'b':		/* brief comments in data section */
 	  formatting_specs.brief_data_cmnts = true;
-	  switch (tolower(optarg[0])) {
+	  switch (tolower((int)optarg[0])) {
 	    case 'c':
 	      formatting_specs.data_lang = LANG_C;
 	      break;
@@ -1957,7 +1957,7 @@ main(int argc, char *argv[])
 	  break;
 	case 'f':		/* full comments in data section */
 	  formatting_specs.full_data_cmnts = true;
-	  switch (tolower(optarg[0])) {
+	  switch (tolower((int)optarg[0])) {
 	    case 'c':
 	      formatting_specs.data_lang = LANG_C;
 	      break;

ncdump/tst_bom.sh

@@ -45,7 +45,7 @@ if ../ncgen/ncgen -k1 -o tst_bom16.nc tst_bom16.cdl ; then
 echo 'BOM Big Endian 16 succeeded, but should not'
 exit 1
 else
-echo '***XFAIL: BOM Big Endian 16'
+echo '***XFAIL : BOM Big Endian 16'
 fi
 
 # Cleanup

ncdump/tst_netcdf4_4.sh

@@ -81,14 +81,14 @@ else # Non-MINGW Platforms
     diff -b tst_compounds4.cdl $srcdir/ref_tst_compounds4.cdl
 
     # Exercise Jira NCF-213 bug fix
-    rm -f tst_ncf213.cdl tst_ncf213.nc
+#    rm -f tst_ncf213.cdl tst_ncf213.nc
     ../ncgen/ncgen -b -o tst_ncf213.nc $srcdir/ref_tst_ncf213.cdl
     ./ncdump -s -h tst_ncf213.nc >tst_ncf213.cdl
     # Now compare
     ok=1;
     if diff -b $srcdir/ref_tst_ncf213.cdl tst_ncf213.cdl ; then ok=1; else ok=0; fi
     # cleanup
-    rm -f tst_ncf213.cdl tst_ncf213.nc
+#    rm -f tst_ncf213.cdl tst_ncf213.nc
     if test $ok = 0 ; then
       echo "*** FAIL: NCF-213 Bug Fix test"
       exit 1