diff --git a/.gitignore b/.gitignore index 3d49b8adb..6a370e9e0 100644 --- a/.gitignore +++ b/.gitignore @@ -2,7 +2,18 @@ build html doxygen*.tmp \#*.*\# +*.*~ +*.o +*.lo +*.la +Makefile.in +stamp-h1 autom4te.cache myhtml CMakeLists.txt.user scan-build +.deps +.libs +*.zip +*.gz +Makefile diff --git a/cf b/cf index 2ae178328..f36128ef3 100644 --- a/cf +++ b/cf @@ -8,7 +8,7 @@ fi HDF5=1 DAP=1 -HDF4=1 +#HDF4=1 #PNETCDF=1 #RPC=1 diff --git a/libdap2/daputil.c b/libdap2/daputil.c index f6c9ff441..acc3cdbbe 100644 --- a/libdap2/daputil.c +++ b/libdap2/daputil.c @@ -36,7 +36,7 @@ nc__testurl(const char* path, char** basenamep) NCURI* uri; int ok = ncuriparse(path,&uri); if(ok) { - char* slash = strrchr(uri->file, '/'); + char* slash = (uri->file == NULL ? NULL : strrchr(uri->file, '/')); char* dot; if(slash == NULL) slash = (char*)path; else slash++; slash = nulldup(slash); diff --git a/libdap2/env b/libdap2/env index 73faa491e..5909098c6 100644 --- a/libdap2/env +++ b/libdap2/env @@ -8,8 +8,8 @@ TOP="/home/dmh/mach/netcdf-c" #TOP="/cygdrive/f/svn/trunk" #TOP="/cygdrive/c/Users/dmh/svn/trunk" -F="http://ticket:ticket1@utmea.enea.it:8080/thredds/dodsC/UNIDATA_passwd/head_out.nc" - +#F="http://ticket:ticket1@utmea.enea.it:8080/thredds/dodsC/UNIDATA_passwd/head_out.nc" +F="http://motherlode.ucar.edu" #PROG=./ncd PROG="$TOP/ncdump/ncdump" diff --git a/ncdap_test/CMakeLists.txt b/ncdap_test/CMakeLists.txt index 387ff1267..f538c869d 100644 --- a/ncdap_test/CMakeLists.txt +++ b/ncdap_test/CMakeLists.txt @@ -42,6 +42,7 @@ IF(ENABLE_TESTS) add_bin_test(ncdap test_partvar) add_bin_test(ncdap test_varm3) add_bin_test(ncdap t_auth) + add_bin_test(ncdap t_misc) ENDIF() diff --git a/ncdap_test/Makefile.am b/ncdap_test/Makefile.am index b97e8ce0e..ef07d4d8b 100644 --- a/ncdap_test/Makefile.am +++ b/ncdap_test/Makefile.am @@ -38,18 +38,21 @@ test_varm3_SOURCES = test_varm3.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 += test_varm3 TESTS += t_dap3a TESTS += test_nstride_cached TESTS += t_auth +TESTS += t_misc check_PROGRAMS += t_dap3a test_cvt3 test_vara test_partvar check_PROGRAMS += test_varm3 check_PROGRAMS += t_dap3a check_PROGRAMS += test_nstride_cached check_PROGRAMS += t_auth +check_PROGRAMS += t_misc endif #ENABLE_DAP_REMOTE_TESTS diff --git a/ncdap_test/t_misc.c b/ncdap_test/t_misc.c new file mode 100644 index 000000000..2c2ad2500 --- /dev/null +++ b/ncdap_test/t_misc.c @@ -0,0 +1,37 @@ +#include "config.h" +#include +#include +#include +#include + + +#define URL1 "http://thredds-test.ucar.edu" /* test that no trailing / is ok */ + +static void +CHECK(int e, const char* msg) +{ + if(e == NC_NOERR) return; + if(msg == NULL) msg = "Error"; + printf("%s: %s\n", msg, nc_strerror(e)); + exit(1); +} + +static void +XFAIL(int e, const char* msg) +{ + if(e == NC_NOERR) return; + if(msg == NULL) msg = "XFAIL"; + printf("%s: %s\n", msg, nc_strerror(e)); +} + +int +main() +{ + int ncid,retval; + + printf("Testing: Misc. Tests \n"); + retval = nc_open(URL1, 0, &ncid); + XFAIL(retval,"*** XFail : No trailing slash in url"); + retval = nc_close(ncid); + return 0; +}