diff --git a/libdap2/env b/libdap2/env index fd751e0e4..97d80303e 100644 --- a/libdap2/env +++ b/libdap2/env @@ -6,7 +6,7 @@ alias xx="cd ..;make; cd libdap2" PARMS=""; ARGS=""; CON="" ; CE=""; OCON="" ; VAR=""; SHARP='#' alias q0=;alias qq=;alias qv=;alias q=;alias qh=;alias qqh=;alias qall=;alias qv=;alias qo=; -F="file://${TOP}/ncdap_test/testdata3/synth9" +F="http://remotetest.unidata.ucar.edu/dts/test.01" if test -f ./ncd ; then PROG=./ncd diff --git a/ncdap_test/test_vara.c b/ncdap_test/test_vara.c index 175277205..d636d45bd 100644 --- a/ncdap_test/test_vara.c +++ b/ncdap_test/test_vara.c @@ -136,7 +136,7 @@ static int check(size_t* start, size_t* count) size_t offset = odom_count(odom); if(floateq(result[offset],expected[offset])) { fprintf(stderr,"fail: result[%lu] = %f ; expected[%lu] = %f\n", - offset,result[offset],offset,expected[offset]); + (long unsigned)offset,result[offset],(long unsigned)offset,expected[offset]); ok=0; } odom_incr(odom); diff --git a/ncdap_test/testdata3/Makefile.am b/ncdap_test/testdata3/Makefile.am index 3b70c64e2..e3578bb6d 100755 --- a/ncdap_test/testdata3/Makefile.am +++ b/ncdap_test/testdata3/Makefile.am @@ -13,8 +13,6 @@ synth4.das synth4.dds synth4.dods \ synth5.das synth5.dds synth5.dods \ synth6.das synth6.dds synth6.dods \ synth7.das synth7.dds synth7.dods \ -synth8.das synth8.dds synth8.dods \ -synth9.das synth9.dds synth9.dods \ synth10.das synth10.dds synth10.dods \ 123bears.nc.das 123bears.nc.dds 123bears.nc.dods \ 123.nc.das 123.nc.dds 123.nc.dods \ @@ -96,3 +94,8 @@ test.vs5.das test.vs5.dds test.vs5.dods \ text.nc.das text.nc.dds text.nc.dods \ whoi.das whoi.dds whoi.dods \ CMakeLists.txt + +# following are not legally convertible to dap2 +#synth8.das synth8.dds synth8.dods +#synth9.das synth9.dds synth9.dods + diff --git a/ncdap_test/testdata3/synth9.dds b/ncdap_test/testdata3/synth9.dds index 760c22346..3975d3bda 100644 --- a/ncdap_test/testdata3/synth9.dds +++ b/ncdap_test/testdata3/synth9.dds @@ -8,4 +8,4 @@ Dataset { } G1; Int32 lat[lat=2]; Int32 long[long=2]; - } TEST3; + } SYNTH9; diff --git a/ncdap_test/testdata3/synth9.dods b/ncdap_test/testdata3/synth9.dods index e9257689c..a9482444d 100644 --- a/ncdap_test/testdata3/synth9.dods +++ b/ncdap_test/testdata3/synth9.dods @@ -4,4 +4,4 @@ Dataset { Float32 v4; } Q2; } Q1; - } SYNTH8; + } SYNTH9; diff --git a/ncdap_test/tst_ncdap.sh b/ncdap_test/tst_ncdap.sh index 42ba0e775..77cc32a60 100755 --- a/ncdap_test/tst_ncdap.sh +++ b/ncdap_test/tst_ncdap.sh @@ -1,7 +1,5 @@ #!/bin/sh -set -e -#set -x quiet=0 leakcheck=0 @@ -68,7 +66,7 @@ fi rm -fr ${RESULTSDIR} mkdir "${RESULTSDIR}" -rm -f ./.dodsrc ./.ocrc +rm -f ./.dodsrc ./.ocrc ./.daprc passcount=0 xfailcount=0 failcount=0 @@ -116,13 +114,15 @@ for x in ${TESTSET} ; do done -rm -f ./.dodsrc +rm -f ./.dodsrc ./.ocrc ./.daprc cd .. +echo "pwd=" `pwd` totalcount=`expr $passcount + $failcount + $xfailcount` okcount=`expr $passcount + $xfailcount` + echo "*** PASSED: ${okcount}/${totalcount} ; ${xfailcount} expected failures ; ${failcount} unexpected failures" #failcount=0 diff --git a/ncdap_test/tst_ncdap_shared.sh b/ncdap_test/tst_ncdap_shared.sh index 1c969d161..8fbbe7e41 100755 --- a/ncdap_test/tst_ncdap_shared.sh +++ b/ncdap_test/tst_ncdap_shared.sh @@ -8,11 +8,9 @@ FILEURL="file://${testdata3}" -# Synth8 still fails +# Synth8 and Synth9 still fail SYNTHETICDATA="synth1 synth2 synth3 synth4 synth5 synth6 synth7 synth10" -SYNTHETICDDS="synth9" - ACTUALDATA1=\ "1990-S1700101.HDF.WVC_Lat 1998-6-avhrr.dat \ @@ -53,5 +51,5 @@ fi FILETESTS="${SYNTHETICDATA} ${ACTUALDATA1} ${ACTUALDATA2}" #DDSTESTS intersect FILETESTS should empty -DDSTESTS="${SYNTHETICDDS}" +DDSTESTS= diff --git a/oc2/occurlfunctions.c b/oc2/occurlfunctions.c index 29fee704d..daeb8cae8 100644 --- a/oc2/occurlfunctions.c +++ b/oc2/occurlfunctions.c @@ -215,7 +215,7 @@ ocset_flags_perlink(OCstate* state) if(stat == OC_NOERR) stat = ocset_curlflag(state,CURLOPT_ENCODING); if(stat == OC_NOERR) stat = ocset_curlflag(state,CURLOPT_NETRC); - if(stat == OC_NOERR) stat = ocset_curlflag(state,CURLOPT_VERBOSE); +// if(stat == OC_NOERR) stat = ocset_curlflag(state,CURLOPT_VERBOSE); if(stat == OC_NOERR) stat = ocset_curlflag(state,CURLOPT_TIMEOUT); if(stat == OC_NOERR) stat = ocset_curlflag(state,CURLOPT_USERAGENT); if(stat == OC_NOERR) stat = ocset_curlflag(state,CURLOPT_COOKIEJAR);