summaryrefslogtreecommitdiffstats
path: root/tools/test/h5diff
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2018-04-30 16:05:26 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2018-04-30 16:05:26 (GMT)
commitfde2d1fe4a452abe82404bee60e34151acdd186b (patch)
tree253d779d21ff2d71178472f40ed20214891c6dce /tools/test/h5diff
parent6fb94eb3a38ea5f6d7253b72f7038ac00f295962 (diff)
parent1f8cb03e11a46f853881f45dac18eff2dd68401e (diff)
downloadhdf5-fde2d1fe4a452abe82404bee60e34151acdd186b.zip
hdf5-fde2d1fe4a452abe82404bee60e34151acdd186b.tar.gz
hdf5-fde2d1fe4a452abe82404bee60e34151acdd186b.tar.bz2
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '1f8cb03e11a46f853881f45dac18eff2dd68401e': Fix errors in Makefile.am files that cause "make check" to repeat test, even when there are no changes to source files. (Also add a ggenerated script to the list of files cleaned up on 'make distclean') Further minor cleanups Checkpoint normalization against incoming hyperslab / selection / dataspace improvements.
Diffstat (limited to 'tools/test/h5diff')
-rw-r--r--tools/test/h5diff/Makefile.am8
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/test/h5diff/Makefile.am b/tools/test/h5diff/Makefile.am
index a2ce9c4..3a88573 100644
--- a/tools/test/h5diff/Makefile.am
+++ b/tools/test/h5diff/Makefile.am
@@ -35,7 +35,11 @@ TEST_SCRIPT=testh5diff.sh
check_PROGRAMS=$(TEST_PROG)
check_SCRIPTS=$(TEST_SCRIPT) $(TEST_SCRIPT_PARA)
# The parallel test script testph5diff.sh actually depends on testh5diff.sh.
-SCRIPT_DEPEND=../../src/h5diff/h5diff$(EXEEXT) $(H5PDIFF) ../../src/h5diff/testh5diff.sh
+if BUILD_PARALLEL_CONDITIONAL
+ SCRIPT_DEPEND=../../src/h5diff/h5diff$(EXEEXT) $(H5PDIFF) $(TEST_SCRIPT)
+else
+ SCRIPT_DEPEND=../../src/h5diff/h5diff$(EXEEXT) $(H5PDIFF)
+endif
if HAVE_SHARED_CONDITIONAL
if USE_PLUGINS_CONDITIONAL
TEST_SCRIPT += h5diff_plugin.sh
@@ -59,7 +63,7 @@ endif
# be copied to the testfiles/ directory if update is required
CHECK_CLEANFILES+=*.h5 expect_sorted actual_sorted
-DISTCLEANFILES=h5diff_plugin.sh
+DISTCLEANFILES=testh5diff.sh h5diff_plugin.sh
include $(top_srcdir)/config/conclude.am