diff --git a/CMakeLists.txt b/CMakeLists.txt index c9318fdd3e..bbd890f211 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1038,8 +1038,7 @@ IF(NOT WIN32) ENDIF() # Option to Enable DAP long tests, remote tests. -# Temporarily disable -OPTION(ENABLE_DAP_REMOTE_TESTS "Enable DAP remote tests." OFF) +OPTION(ENABLE_DAP_REMOTE_TESTS "Enable DAP remote tests." ON) OPTION(ENABLE_DAP_LONG_TESTS "Enable DAP long tests." OFF) SET(REMOTETESTSERVERS "remotetest.unidata.ucar.edu" CACHE STRING "test servers to use for remote test") diff --git a/configure.ac b/configure.ac index 4b3f97ab38..46a3e06aec 100644 --- a/configure.ac +++ b/configure.ac @@ -526,7 +526,7 @@ AC_MSG_CHECKING([whether dap remote testing should be enabled]) AC_ARG_ENABLE([dap-remote-tests], [AS_HELP_STRING([--enable-dap-remote-tests], [enable dap remote tests])]) -test "x$enable_dap_remote_tests" = xyes || enable_dap_remote_tests=no +test "x$enable_dap_remote_tests" = xno || enable_dap_remote_tests=yes if test "x$enable_dap" = "xno" ; then enable_dap_remote_tests=no fi diff --git a/ncdap_test/tst_urls.sh b/ncdap_test/tst_urls.sh index f41f2ea978..b3a8bfda22 100644 --- a/ncdap_test/tst_urls.sh +++ b/ncdap_test/tst_urls.sh @@ -83,8 +83,9 @@ COLUMBIA="http://iridl.ldeo.columbia.edu/SOURCES/.Models/.NMME/.NASA-GMAO/.MONTH # Known to fail XFAILTESTS= + # Suppress some tests if not windows platform. -if test "x$platform" == xmingw ; then +if test "x$FP_ISMSVC" != xyes ; then XFAILTESTS="$XFAILTESTS test.67" fi @@ -94,6 +95,9 @@ NOCACHETESTS="test.07" # Following tests must be run as not prefetch NOPREFETCHTESTS="test.07" +# Following tests must be run as not prefetch +NOPREFETCHTESTS="test.07" + computewhich() { # set REMOTETESTS and constrained case "$1" in S0) REMOTETESTS="$S0" ; constrained=0 ;; @@ -158,7 +162,7 @@ for x in ${REMOTETESTS} ; do if IGNORE=`echo -n " ${XFAILTESTS} " | fgrep " ${name} "`; then isxfail=1; fi fi ok=1 - if ${NCDUMP} ${FLAGS} "${url}" | sed 's/\\r//g' > ${name}.dmp ; then ok=$ok; else ok=0; fi + if ${NCDUMP} ${DUMPFLAGS} "${url}" | sed 's/\\r//g' > ${name}.dmp ; then ok=$ok; else ok=0; fi # compare with expected if diff -w ${EXPECTED}/${name}.dmp ${name}.dmp ; then ok=$ok; else ok=0; fi processstatus