diff options
author | Larry Knox <lrknox@hdfgroup.org> | 2020-03-19 21:32:09 (GMT) |
---|---|---|
committer | Larry Knox <lrknox@hdfgroup.org> | 2020-03-19 21:32:09 (GMT) |
commit | 0a6e3e58b94d988c9dc848406f8d0efaffbe9a23 (patch) | |
tree | 15716b78b101cfb1a5ce442493f18f00d159516f | |
parent | 27e14f31f7dce3765d6c3ce51b6ff4e700a22e19 (diff) | |
parent | 1cc2b65b1f745d9b7d770504fb3def73ba8346c1 (diff) | |
download | hdf5-0a6e3e58b94d988c9dc848406f8d0efaffbe9a23.zip hdf5-0a6e3e58b94d988c9dc848406f8d0efaffbe9a23.tar.gz hdf5-0a6e3e58b94d988c9dc848406f8d0efaffbe9a23.tar.bz2 |
Merge pull request #2459 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_8 to hdf5_1_8
* commit '1cc2b65b1f745d9b7d770504fb3def73ba8346c1':
Fixes for test failures with --disable-tests --disable-tools options. Don't test ph5diff if tests are disabled.
-rwxr-xr-x | configure | 8 | ||||
-rw-r--r-- | configure.ac | 8 | ||||
-rw-r--r-- | tools/h5diff/Makefile.am | 4 | ||||
-rw-r--r-- | tools/h5diff/Makefile.in | 3 |
4 files changed, 16 insertions, 7 deletions
@@ -27548,8 +27548,10 @@ esac ADD_PARALLEL_FILES="no" if test -n "$PARALLEL"; then - ## The 'testpar' directory should participate in the build - TESTPARALLEL=testpar + if test "X$HDF5_TESTS" = "Xyes"; then + ## The 'testpar' directory should participate in the build + TESTPARALLEL=testpar + fi ## We are building a parallel library @@ -29429,7 +29431,7 @@ else BUILD_CXX_CONDITIONAL_FALSE= fi - if test -n "$TESTPARALLEL"; then + if test -n "$PARALLEL"; then BUILD_PARALLEL_CONDITIONAL_TRUE= BUILD_PARALLEL_CONDITIONAL_FALSE='#' else diff --git a/configure.ac b/configure.ac index e20f46b..2254e19 100644 --- a/configure.ac +++ b/configure.ac @@ -2046,8 +2046,10 @@ esac AC_SUBST([ADD_PARALLEL_FILES]) ADD_PARALLEL_FILES="no" if test -n "$PARALLEL"; then - ## The 'testpar' directory should participate in the build - TESTPARALLEL=testpar + if test "X$HDF5_TESTS" = "Xyes"; then + ## The 'testpar' directory should participate in the build + TESTPARALLEL=testpar + fi ## We are building a parallel library AC_DEFINE([HAVE_PARALLEL], [1], [Define if we have parallel support]) @@ -3013,7 +3015,7 @@ LDFLAGS="$saved_user_LDFLAGS" ## need to be compiled AM_CONDITIONAL([BUILD_CXX_CONDITIONAL], [test "X$HDF_CXX" = "Xyes"]) -AM_CONDITIONAL([BUILD_PARALLEL_CONDITIONAL], [test -n "$TESTPARALLEL"]) +AM_CONDITIONAL([BUILD_PARALLEL_CONDITIONAL], [test -n "$PARALLEL"]) AM_CONDITIONAL([BUILD_FORTRAN_CONDITIONAL], [test "X$HDF_FORTRAN" = "Xyes"]) AM_CONDITIONAL([BUILD_HDF5_HL_CONDITIONAL], [test "X$HDF5_HL" = "Xyes"]) AM_CONDITIONAL([BUILD_TESTS_CONDITIONAL], [test "X$HDF5_TESTS" = "Xyes"]) diff --git a/tools/h5diff/Makefile.am b/tools/h5diff/Makefile.am index ce3a370..13044e5 100644 --- a/tools/h5diff/Makefile.am +++ b/tools/h5diff/Makefile.am @@ -25,7 +25,11 @@ AM_CPPFLAGS+=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib # is enabled. if BUILD_PARALLEL_CONDITIONAL H5PDIFF=ph5diff +if BUILD_TESTS_CONDITIONAL TEST_SCRIPT_PARA=testph5diff.sh +else + TEST_SCRIPT_PARA= +endif endif # Our main target, h5diff diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in index 95dfbb6..5c7cffa 100644 --- a/tools/h5diff/Makefile.in +++ b/tools/h5diff/Makefile.in @@ -708,7 +708,8 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog *.clog2 *.h5 expect_sorted \ # Always build and test h5diff but build and test ph5diff only if parallel # is enabled. @BUILD_PARALLEL_CONDITIONAL_TRUE@H5PDIFF = ph5diff -@BUILD_PARALLEL_CONDITIONAL_TRUE@TEST_SCRIPT_PARA = testph5diff.sh +@BUILD_PARALLEL_CONDITIONAL_TRUE@@BUILD_TESTS_CONDITIONAL_FALSE@TEST_SCRIPT_PARA = +@BUILD_PARALLEL_CONDITIONAL_TRUE@@BUILD_TESTS_CONDITIONAL_TRUE@TEST_SCRIPT_PARA = testph5diff.sh # Add h5diff specific linker flags here h5diff_LDFLAGS = $(LT_STATIC_EXEC) $(AM_LDFLAGS) |