Merge branch 'temp-dev'

This commit is contained in:
Ward Fisher 2014-03-07 14:04:19 -07:00
commit 13b6603ccb
3 changed files with 24 additions and 2 deletions

View File

@ -302,12 +302,19 @@ MACRO(print_conf_summary)
MESSAGE(STATUS "\tUsing pnetcdf:\t\t\t" ${STATUS_PNETCDF})
MESSAGE(STATUS "\tUsing Parallel IO:\t\t" ${STATUS_PARALLEL})
MESSAGE("")
MESSAGE(STATUS "Compiler:")
IF(ENABLE_TESTS)
MESSAGE(STATUS "\tTests Enabled:\t\t\t${ENABLE_TESTS}")
MESSAGE(STATUS "\tDAP Remote Tests:\t\t${ENABLE_DAP_REMOTE_TESTS}")
MESSAGE(STATUS "\tDAP AUTH Tests:\t\t\t${ENABLE_DAP_AUTH_TESTS}")
MESSAGE("")
ENDIF()
MESSAGE("Compiler:")
MESSAGE("")
MESSAGE(STATUS "CMAKE_C_COMPILER:\t\t ${CMAKE_C_COMPILER}")
MESSAGE(STATUS "CMAKE_C_FLAGS:\t\t" ${CMAKE_C_FLAGS})
MESSAGE(STATUS "CMAKE_CXX_FLAGS:\t\t" ${CMAKE_CXX_FLAGS})
MESSAGE(STATUS "Linking against:\t\t" "${ALL_TLL_LIBS}")
MESSAGE("")
@ -657,6 +664,11 @@ ENDIF()
OPTION(ENABLE_DAP_LONG_TESTS "Enable DAP long tests." OFF)
OPTION(ENABLE_DAP_REMOTE_TESTS "Enable DAP remote tests." ON)
IF(ENABLE_DAP_REMOTE_TESTS)
OPTION(ENABLE_DAP_AUTH_TESTS "Enable DAP remote authorization tests.")
ENDIF()
# If netCDF4 and DAP, Option for DAP groups.
IF(ENABLE_NETCDF_4 AND USE_DAP)
OPTION(ENABLE_DAP_GROUPS "Whether netcdf4 group names should be enabled." ON)

View File

@ -7,6 +7,11 @@ This file contains a high-level description of this package's evolution. Release
## 4.3.1.2 Released TBD
* Added a separate flag to enable DAP AUTH tests. These tests are disabled by default. The flags for autotools and CMAKE-based builds are (respectively):
* --enable-dap-auth-tests
* -DENABLE\_DAP\_AUTH\_TESTS
* Fixed small default chunk size for 1-dimensional record variables. [NCF-211](https://bugtracking.unidata.ucar.edu/browse/NCF-211)
* Cleaned up type handling in netCDF-4 to fix bugs with fill-values.

View File

@ -40,8 +40,13 @@ IF(ENABLE_TESTS)
ENDIF()
add_bin_test(ncdap test_nstride_cached)
add_bin_test(ncdap test_partvar)
add_bin_test(ncdap t_auth)
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