From 3a316cfc638d104045ca22da0d73b0d7121237bc Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Thu, 18 Jul 2013 00:12:27 -0500 Subject: [svn-r23917] Bug fix: HDFFV-8392 tools/h5diff/testh5diff.sh is run in every "make check", even after it has passed in the previous run. The error was in the previous change made to Makefile.am when testh5diff.sh.in was created. The mistake was in the SCRIPT_DEPEND=h5diff$(EXEEXT) $(H5PDIFF) $(srcdir)/testh5diff.sh $(srcdir)/testh5diff.sh no longer existed. It is now generated in the current built directory from $(srcdir)/testh5diff.sh.in (which configure takes care of). I updated the dependance to SCRIPT_DEPEND=h5diff$(EXEEXT) $(H5PDIFF) testh5diff.sh and that fixes the error. Reviewed: HDF5-149 Tested: h5committested. --- tools/h5diff/Makefile.am | 2 +- tools/h5diff/Makefile.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/h5diff/Makefile.am b/tools/h5diff/Makefile.am index 190c083..05417f5 100644 --- a/tools/h5diff/Makefile.am +++ b/tools/h5diff/Makefile.am @@ -43,7 +43,7 @@ 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=h5diff$(EXEEXT) $(H5PDIFF) $(srcdir)/testh5diff.sh +SCRIPT_DEPEND=h5diff$(EXEEXT) $(H5PDIFF) testh5diff.sh # Source files for the program h5diff_SOURCES=h5diff_main.c h5diff_common.c diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in index 5567ceb..9b46f4e 100644 --- a/tools/h5diff/Makefile.in +++ b/tools/h5diff/Makefile.in @@ -456,7 +456,7 @@ TEST_PROG = h5diffgentest TEST_SCRIPT = testh5diff.sh check_SCRIPTS = $(TEST_SCRIPT) $(TEST_SCRIPT_PARA) # The parallel test script testph5diff.sh actually depends on testh5diff.sh. -SCRIPT_DEPEND = h5diff$(EXEEXT) $(H5PDIFF) $(srcdir)/testh5diff.sh +SCRIPT_DEPEND = h5diff$(EXEEXT) $(H5PDIFF) testh5diff.sh # Source files for the program h5diff_SOURCES = h5diff_main.c h5diff_common.c -- cgit v0.12