diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2020-03-19 20:09:55 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2020-03-19 20:09:55 (GMT) |
| commit | 1cc2b65b1f745d9b7d770504fb3def73ba8346c1 (patch) | |
| tree | 15716b78b101cfb1a5ce442493f18f00d159516f /tools | |
| parent | 27e14f31f7dce3765d6c3ce51b6ff4e700a22e19 (diff) | |
| download | hdf5-1cc2b65b1f745d9b7d770504fb3def73ba8346c1.zip hdf5-1cc2b65b1f745d9b7d770504fb3def73ba8346c1.tar.gz hdf5-1cc2b65b1f745d9b7d770504fb3def73ba8346c1.tar.bz2 | |
Fixes for test failures with --disable-tests --disable-tools options.
Don't test ph5diff if tests are disabled.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/h5diff/Makefile.am | 4 | ||||
| -rw-r--r-- | tools/h5diff/Makefile.in | 3 |
2 files changed, 6 insertions, 1 deletions
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) |