summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2018-07-19 16:23:38 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2018-07-19 16:23:38 (GMT)
commite13beff99f2981241b5afc1bf7416b65313b13df (patch)
tree763c3a4cded77c5c24dc3f41d363759e279ad83a
parent64d8a679438938fe456d5f506b9828d7d8aa2db0 (diff)
parent77fa93e07b2b860ca314b2c332ebd440544e3326 (diff)
downloadhdf5-e13beff99f2981241b5afc1bf7416b65313b13df.zip
hdf5-e13beff99f2981241b5afc1bf7416b65313b13df.tar.gz
hdf5-e13beff99f2981241b5afc1bf7416b65313b13df.tar.bz2
Merge pull request #1144 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit '77fa93e07b2b860ca314b2c332ebd440544e3326': Add cmakehdf5 command line option to turn on shell script testing. Option is on by default but can be disabled with --disable-shell-testing.
-rwxr-xr-xbin/cmakehdf510
1 files changed, 9 insertions, 1 deletions
diff --git a/bin/cmakehdf5 b/bin/cmakehdf5
index 7f6453a..da1aef8 100755
--- a/bin/cmakehdf5
+++ b/bin/cmakehdf5
@@ -46,8 +46,9 @@ cacheinit=$srcdir/config/cmake/cacheinit.cmake
build_cpp_lib=-DHDF5_BUILD_CPP_LIB:BOOL=OFF # C++ interface default off
build_fortran=-DHDF5_BUILD_FORTRAN:BOOL=OFF # Fortran interface default off
build_hl_lib=-DHDF5_BUILD_HL_LIB:BOOL=ON # High Level interface default on
-build_threadsafe=-DHDF5_ENABLE_THREADSAFE:BOOL=OFF # Threadsafe feature default off
+build_threadsafe=-DHDF5_ENABLE_THREADSAFE:BOOL=OFF # Threadsafe feature default off
build_testing=-DBUILD_TESTING:BOOL=ON # Build tests default on
+build_test_shell=-DTEST_SHELL_SCRIPTS:BOOL=ON # Run shell script tests default on
build_tools=-DHDF5_BUILD_TOOLS:BOOL=ON # Build tools default on
with_zlib=-DHDF5_ENABLE_Z_LIB_SUPPORT=ON # enable zlib filter default on
with_szlib=-DHDF5_ENABLE_SZIP_SUPPORT=OFF # enables szip filter default off
@@ -256,6 +257,12 @@ while [ $# -gt 0 ]; do
--disable-testing)
build_testing=-DBUILD_TESTING:BOOL=OFF
;;
+ --enable-shell-testing)
+ build_test_shell=-DTEST_SHELL_SCRIPTS:BOOL=ON
+ ;;
+ --disable-shell-testing)
+ build_test_shell=-DTEST_SHELL_SCRIPTS:BOOL=OFF
+ ;;
--with-zlib)
with_zlib=-DHDF5_ENABLE_Z_LIB_SUPPORT:BOOL=ON
;;
@@ -342,6 +349,7 @@ STEP "Configure..." \
$build_threadsafe \
$shared_lib \
$build_testing \
+ $build_test_shell \
$build_tools \
$with_zlib \
$with_szlib \