diff options
| author | James Laird <jlaird@hdfgroup.org> | 2005-08-30 23:42:39 (GMT) |
|---|---|---|
| committer | James Laird <jlaird@hdfgroup.org> | 2005-08-30 23:42:39 (GMT) |
| commit | 66af6dce17787f70e7bded57fdc63b1006ade754 (patch) | |
| tree | eb9ecc21bd4c265448324f9e192efac02fd841d8 | |
| parent | 70ddbda208079d6597e453b510f9bfa9320cf0bf (diff) | |
| download | hdf5-66af6dce17787f70e7bded57fdc63b1006ade754.zip hdf5-66af6dce17787f70e7bded57fdc63b1006ade754.tar.gz hdf5-66af6dce17787f70e7bded57fdc63b1006ade754.tar.bz2 | |
[svn-r11319] Purpose:
Bug fixes
Description:
This checkin fixes an occasional error on kelgia on sol during distclean.
It also causes test scripts to depend properly on the programs they're
supposed to be testing.
Solution:
The kelgia bug was due to some files being cleaned by automake and manually.
Removed the manual cleaning in src/Makefile.am.
Test script dependencies now need to be specified manually, since the
makefile can't guess what they test from their name. Currently all test
scripts in a given directory have a single list of dependencies--this was
easy and seems to be sufficient.
These dependencies are listed in the SCRIPT_DEPEND variable in the Makefile.am.
Platforms tested:
heping, mir, modi4, sol
Misc. update:
45 files changed, 77 insertions, 59 deletions
@@ -12,18 +12,33 @@ ## http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html. If you do not have ## access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. ## -# Compare the modification of two files. If file1 is newer than file2, -# return true (0). Otherwise return false (1). If file1 or file2 does -# not exist or is not a file, return false (1). +# Compare the modification time of file argument 1 against other file arguments. +# Return true (0) if argument 1 is newer than all others, otherwise return +# false (1). If any of the argument is not a file, return false (1). # # Programmer: Albert Cheng # Created Date: 2005/07/06 +# Modification: +# Albert Cheng 2005/8/30 +# Changed from two arguments to mulitple arguments. -if test $# -eq 2; then - if test -f $1 -a -f $2; then - if test X != X`find $1 -newer $2 -print`; then - exit 0 - fi - fi +if test $# -lt 2; then + exit 1 +fi +if test ! -f $1; then + exit 1 fi -exit 1 +f1=$1 +shift + +for f in $*; do + if ! test -f $f; then + exit 1 + fi + if test X = X`find $f1 -newer $f -print`; then + exit 1 + fi +done + +# passed all tests. Must be a file newer than all others. +exit 0 diff --git a/c++/Makefile.in b/c++/Makefile.in index 9493d61..31c4e67 100644 --- a/c++/Makefile.in +++ b/c++/Makefile.in @@ -750,7 +750,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_: tname=`basename $(@:.chkexe_=)`;\ log=`basename $(@:.chkexe_=.chklog)`; \ echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(@:.chkexe_=); then \ + if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(SCRIPT_DEPEND); then \ echo "No need to test $${tname} again."; \ else \ echo "============================" > $${log}; \ diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in index 356ae90..c94a250 100644 --- a/c++/examples/Makefile.in +++ b/c++/examples/Makefile.in @@ -649,7 +649,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_: tname=`basename $(@:.chkexe_=)`;\ log=`basename $(@:.chkexe_=.chklog)`; \ echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(@:.chkexe_=); then \ + if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(SCRIPT_DEPEND); then \ echo "No need to test $${tname} again."; \ else \ echo "============================" > $${log}; \ diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index 1a27dbe..b781a79 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -836,7 +836,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_: tname=`basename $(@:.chkexe_=)`;\ log=`basename $(@:.chkexe_=.chklog)`; \ echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(@:.chkexe_=); then \ + if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(SCRIPT_DEPEND); then \ echo "No need to test $${tname} again."; \ else \ echo "============================" > $${log}; \ diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in index b47de55..b369f5e 100644 --- a/c++/test/Makefile.in +++ b/c++/test/Makefile.in @@ -724,7 +724,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_: tname=`basename $(@:.chkexe_=)`;\ log=`basename $(@:.chkexe_=.chklog)`; \ echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(@:.chkexe_=); then \ + if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(SCRIPT_DEPEND); then \ echo "No need to test $${tname} again."; \ else \ echo "============================" > $${log}; \ diff --git a/config/conclude.am b/config/conclude.am index 88c7d3b..79f7e49 100644 --- a/config/conclude.am +++ b/config/conclude.am @@ -127,7 +127,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_: tname=`basename $(@:.chkexe_=)`;\ log=`basename $(@:.chkexe_=.chklog)`; \ echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(@:.chkexe_=); then \ + if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(SCRIPT_DEPEND); then \ echo "No need to test $${tname} again."; \ else \ echo "============================" > $${log}; \ diff --git a/examples/Makefile.in b/examples/Makefile.in index a524031..1867c08 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -663,7 +663,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_: tname=`basename $(@:.chkexe_=)`;\ log=`basename $(@:.chkexe_=.chklog)`; \ echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(@:.chkexe_=); then \ + if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(SCRIPT_DEPEND); then \ echo "No need to test $${tname} again."; \ else \ echo "============================" > $${log}; \ diff --git a/fortran/Makefile.in b/fortran/Makefile.in index 213fd22..ffc634c 100644 --- a/fortran/Makefile.in +++ b/fortran/Makefile.in @@ -759,7 +759,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_: tname=`basename $(@:.chkexe_=)`;\ log=`basename $(@:.chkexe_=.chklog)`; \ echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(@:.chkexe_=); then \ + if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(SCRIPT_DEPEND); then \ echo "No need to test $${tname} again."; \ else \ echo "============================" > $${log}; \ diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in index 0753a52..9835d26 100644 --- a/fortran/examples/Makefile.in +++ b/fortran/examples/Makefile.in @@ -671,7 +671,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_: tname=`basename $(@:.chkexe_=)`;\ log=`basename $(@:.chkexe_=.chklog)`; \ echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(@:.chkexe_=); then \ + if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(SCRIPT_DEPEND); then \ echo "No need to test $${tname} again."; \ else \ echo "============================" > $${log}; \ diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index 69d55c5..1525bb0 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -955,7 +955,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_: tname=`basename $(@:.chkexe_=)`;\ log=`basename $(@:.chkexe_=.chklog)`; \ echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(@:.chkexe_=); then \ + if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(SCRIPT_DEPEND); then \ echo "No need to test $${tname} again."; \ else \ echo "============================" > $${log}; \ diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in index 52fdc92..0685dbe 100644 --- a/fortran/test/Makefile.in +++ b/fortran/test/Makefile.in @@ -927,7 +927,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_: tname=`basename $(@:.chkexe_=)`;\ log=`basename $(@:.chkexe_=.chklog)`; \ echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(@:.chkexe_=); then \ + if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(SCRIPT_DEPEND); then \ echo "No need to test $${tname} again."; \ else \ echo "============================" > $${log}; \ diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in index 0f50653..99d8a4c 100644 --- a/fortran/testpar/Makefile.in +++ b/fortran/testpar/Makefile.in @@ -687,7 +687,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_: tname=`basename $(@:.chkexe_=)`;\ log=`basename $(@:.chkexe_=.chklog)`; \ echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(@:.chkexe_=); then \ + if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(SCRIPT_DEPEND); then \ echo "No need to test $${tname} again."; \ else \ echo "============================" > $${log}; \ diff --git a/hl/Makefile.in b/hl/Makefile.in index 4a1b595..f156cf2 100755 --- a/hl/Makefile.in +++ b/hl/Makefile.in @@ -726,7 +726,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_: tname=`basename $(@:.chkexe_=)`;\ log=`basename $(@:.chkexe_=.chklog)`; \ echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(@:.chkexe_=); then \ + if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(SCRIPT_DEPEND); then \ echo "No need to test $${tname} again."; \ else \ echo "============================" > $${log}; \ diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in index 322e146..e91980b 100644 --- a/hl/c++/Makefile.in +++ b/hl/c++/Makefile.in @@ -729,7 +729,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_: tname=`basename $(@:.chkexe_=)`;\ log=`basename $(@:.chkexe_=.chklog)`; \ echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(@:.chkexe_=); then \ + if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(SCRIPT_DEPEND); then \ echo "No need to test $${tname} again."; \ else \ echo "============================" > $${log}; \ diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in index 43d19d1..37015fe 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -750,7 +750,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_: tname=`basename $(@:.chkexe_=)`;\ log=`basename $(@:.chkexe_=.chklog)`; \ echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(@:.chkexe_=); then \ + if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(SCRIPT_DEPEND); then \ echo "No need to test $${tname} again."; \ else \ echo "============================" > $${log}; \ diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in index c95c1b0..eeeea8c 100644 --- a/hl/c++/test/Makefile.in +++ b/hl/c++/test/Makefile.in @@ -698,7 +698,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_: tname=`basename $(@:.chkexe_=)`;\ log=`basename $(@:.chkexe_=.chklog)`; \ echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(@:.chkexe_=); then \ + if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(SCRIPT_DEPEND); then \ echo "No need to test $${tname} again."; \ else \ echo "============================" > $${log}; \ diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in index d2eb6f7..b0eece3 100644 --- a/hl/fortran/Makefile.in +++ b/hl/fortran/Makefile.in @@ -724,7 +724,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_: tname=`basename $(@:.chkexe_=)`;\ log=`basename $(@:.chkexe_=.chklog)`; \ echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(@:.chkexe_=); then \ + if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(SCRIPT_DEPEND); then \ echo "No need to test $${tname} again."; \ else \ echo "============================" > $${log}; \ diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index 9017241..8aee289 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -771,7 +771,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_: tname=`basename $(@:.chkexe_=)`;\ log=`basename $(@:.chkexe_=.chklog)`; \ echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(@:.chkexe_=); then \ + if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(SCRIPT_DEPEND); then \ echo "No need to test $${tname} again."; \ else \ echo "============================" > $${log}; \ diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in index 7a15e6e..e69c90f 100644 --- a/hl/fortran/test/Makefile.in +++ b/hl/fortran/test/Makefile.in @@ -689,7 +689,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_: tname=`basename $(@:.chkexe_=)`;\ log=`basename $(@:.chkexe_=.chklog)`; \ echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(@:.chkexe_=); then \ + if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(SCRIPT_DEPEND); then \ echo "No need to test $${tname} again."; \ else \ echo "============================" > $${log}; \ diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in index 1534ab6..21a3449 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -738,7 +738,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_: tname=`basename $(@:.chkexe_=)`;\ log=`basename $(@:.chkexe_=.chklog)`; \ echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(@:.chkexe_=); then \ + if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(SCRIPT_DEPEND); then \ echo "No need to test $${tname} again."; \ else \ echo "============================" > $${log}; \ diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in index e02c6fc..c3acb78 100644 --- a/hl/test/Makefile.in +++ b/hl/test/Makefile.in @@ -723,7 +723,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_: tname=`basename $(@:.chkexe_=)`;\ log=`basename $(@:.chkexe_=.chklog)`; \ echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(@:.chkexe_=); then \ + if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(SCRIPT_DEPEND); then \ echo "No need to test $${tname} again."; \ else \ echo "============================" > $${log}; \ diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in index 24cdd44..d023e61 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/Makefile.in @@ -732,7 +732,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_: tname=`basename $(@:.chkexe_=)`;\ log=`basename $(@:.chkexe_=.chklog)`; \ echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(@:.chkexe_=); then \ + if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(SCRIPT_DEPEND); then \ echo "No need to test $${tname} again."; \ else \ echo "============================" > $${log}; \ diff --git a/perform/Makefile.in b/perform/Makefile.in index 8cbca4f..3062c68 100644 --- a/perform/Makefile.in +++ b/perform/Makefile.in @@ -791,7 +791,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_: tname=`basename $(@:.chkexe_=)`;\ log=`basename $(@:.chkexe_=.chklog)`; \ echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(@:.chkexe_=); then \ + if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(SCRIPT_DEPEND); then \ echo "No need to test $${tname} again."; \ else \ echo "============================" > $${log}; \ diff --git a/src/Makefile.am b/src/Makefile.am index 7091120..37d1f54 100755 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -33,13 +33,6 @@ lib_LTLIBRARIES=libhdf5.la # Add libtool numbers to the HDF5 library (from config/lt_vers.am) libhdf5_la_LDFLAGS= -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) -# Temporary files -MOSTLYCLEANFILES=H5detect.o H5detect.lo H5detect H5Tinit.o H5Tinit.lo H5Tinit.c - -# libhdf5.settings is generated during configure. Remove it when distclean. -DISTCLEAN=libhdf5.settings - - # library sources libhdf5_la_SOURCES= H5.c H5A.c H5AC.c H5B.c H5B2.c H5B2cache.c H5B2dbg.c \ H5B2test.c H5BP.c H5BPcache.c H5BPdbg.c H5BPtest.c \ diff --git a/src/Makefile.in b/src/Makefile.in index 082cad0..bef070c 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -357,12 +357,6 @@ lib_LTLIBRARIES = libhdf5.la # Add libtool numbers to the HDF5 library (from config/lt_vers.am) libhdf5_la_LDFLAGS = -version-info $(LT_VERS_INTERFACE):$(LT_VERS_REVISION):$(LT_VERS_AGE) -# Temporary files -MOSTLYCLEANFILES = H5detect.o H5detect.lo H5detect H5Tinit.o H5Tinit.lo H5Tinit.c - -# libhdf5.settings is generated during configure. Remove it when distclean. -DISTCLEAN = libhdf5.settings - # library sources libhdf5_la_SOURCES = H5.c H5A.c H5AC.c H5B.c H5B2.c H5B2cache.c H5B2dbg.c \ H5B2test.c H5BP.c H5BPcache.c H5BPdbg.c H5BPtest.c \ @@ -839,7 +833,6 @@ install-strip: `test -z '$(STRIP)' || \ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: - -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) clean-generic: @@ -1052,7 +1045,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_: tname=`basename $(@:.chkexe_=)`;\ log=`basename $(@:.chkexe_=.chklog)`; \ echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(@:.chkexe_=); then \ + if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(SCRIPT_DEPEND); then \ echo "No need to test $${tname} again."; \ else \ echo "============================" > $${log}; \ diff --git a/test/Makefile.am b/test/Makefile.am index fda3267..3fa1690 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -25,6 +25,7 @@ INCLUDES=-I$(top_srcdir)/src -I$(top_builddir)/src # Test script for error_test and err_compat TEST_SCRIPT = $(top_srcdir)/test/testerror.sh check_SCRIPTS = $(TEST_SCRIPT) +SCRIPT_DEPEND = error_test$(EXEEXT) err_compat$(EXEEXT) # These are our main targets. They should be listed in the order to be diff --git a/test/Makefile.in b/test/Makefile.in index cf071f4..0f562ce 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -521,6 +521,7 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_builddir)/src # Test script for error_test and err_compat TEST_SCRIPT = $(top_srcdir)/test/testerror.sh check_SCRIPTS = $(TEST_SCRIPT) +SCRIPT_DEPEND = error_test$(EXEEXT) err_compat$(EXEEXT) # These are our main targets. They should be listed in the order to be # executed, generally most specific tests to least specific tests. @@ -1151,7 +1152,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_: tname=`basename $(@:.chkexe_=)`;\ log=`basename $(@:.chkexe_=.chklog)`; \ echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(@:.chkexe_=); then \ + if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(SCRIPT_DEPEND); then \ echo "No need to test $${tname} again."; \ else \ echo "============================" > $${log}; \ diff --git a/testpar/Makefile.in b/testpar/Makefile.in index c886e66..05a607d 100644 --- a/testpar/Makefile.in +++ b/testpar/Makefile.in @@ -732,7 +732,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_: tname=`basename $(@:.chkexe_=)`;\ log=`basename $(@:.chkexe_=.chklog)`; \ echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(@:.chkexe_=); then \ + if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(SCRIPT_DEPEND); then \ echo "No need to test $${tname} again."; \ else \ echo "============================" > $${log}; \ diff --git a/tools/Makefile.in b/tools/Makefile.in index ea80007..a425c31 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -731,7 +731,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_: tname=`basename $(@:.chkexe_=)`;\ log=`basename $(@:.chkexe_=.chklog)`; \ echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(@:.chkexe_=); then \ + if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(SCRIPT_DEPEND); then \ echo "No need to test $${tname} again."; \ else \ echo "============================" > $${log}; \ diff --git a/tools/gifconv/Makefile.in b/tools/gifconv/Makefile.in index 24cdd44..d023e61 100644 --- a/tools/gifconv/Makefile.in +++ b/tools/gifconv/Makefile.in @@ -732,7 +732,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_: tname=`basename $(@:.chkexe_=)`;\ log=`basename $(@:.chkexe_=.chklog)`; \ echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(@:.chkexe_=); then \ + if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(SCRIPT_DEPEND); then \ echo "No need to test $${tname} again."; \ else \ echo "============================" > $${log}; \ diff --git a/tools/h5diff/Makefile.am b/tools/h5diff/Makefile.am index 865d9af..fc2a08d 100644 --- a/tools/h5diff/Makefile.am +++ b/tools/h5diff/Makefile.am @@ -38,6 +38,7 @@ TEST_SCRIPT=$(srcdir)/testh5diff.sh check_PROGRAMS=$(TEST_PROG) check_SCRIPTS=$(TEST_SCRIPT) $(TEST_SCRIPT_PARA) +SCRIPT_DEPEND=h5diff$(EXEEXT) # 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 6b19b3c..6d248d7 100644 --- a/tools/h5diff/Makefile.in +++ b/tools/h5diff/Makefile.in @@ -331,6 +331,7 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib TEST_PROG = h5difftst TEST_SCRIPT = $(srcdir)/testh5diff.sh check_SCRIPTS = $(TEST_SCRIPT) $(TEST_SCRIPT_PARA) +SCRIPT_DEPEND = h5diff$(EXEEXT) # Source files for the program h5diff_SOURCES = h5diff_main.c h5diff_common.c @@ -770,7 +771,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_: tname=`basename $(@:.chkexe_=)`;\ log=`basename $(@:.chkexe_=.chklog)`; \ echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(@:.chkexe_=); then \ + if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(SCRIPT_DEPEND); then \ echo "No need to test $${tname} again."; \ else \ echo "============================" > $${log}; \ diff --git a/tools/h5dump/Makefile.am b/tools/h5dump/Makefile.am index c9c1e4d..85b1443 100644 --- a/tools/h5dump/Makefile.am +++ b/tools/h5dump/Makefile.am @@ -28,6 +28,7 @@ TEST_SCRIPT=testh5dump.sh $(srcdir)/testh5dumpxml.sh check_PROGRAMS=$(TEST_PROG) check_SCRIPTS=$(TEST_SCRIPT) +SCRIPT_DEPEND=h5dump$(EXEEXT) # Our main target, the h5dump tool. bin_PROGRAMS=h5dump diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in index 2a822a1..cfcdec4 100644 --- a/tools/h5dump/Makefile.in +++ b/tools/h5dump/Makefile.in @@ -319,6 +319,7 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib TEST_PROG = h5dumpgentest TEST_SCRIPT = testh5dump.sh $(srcdir)/testh5dumpxml.sh check_SCRIPTS = $(TEST_SCRIPT) +SCRIPT_DEPEND = h5dump$(EXEEXT) # All the programs depend on the hdf5 and h5tools libraries LDADD = $(LIBH5TOOLS) $(LIBHDF5) @@ -746,7 +747,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_: tname=`basename $(@:.chkexe_=)`;\ log=`basename $(@:.chkexe_=.chklog)`; \ echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(@:.chkexe_=); then \ + if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(SCRIPT_DEPEND); then \ echo "No need to test $${tname} again."; \ else \ echo "============================" > $${log}; \ diff --git a/tools/h5import/Makefile.am b/tools/h5import/Makefile.am index df59068..7144b5e 100644 --- a/tools/h5import/Makefile.am +++ b/tools/h5import/Makefile.am @@ -28,6 +28,7 @@ TEST_SCRIPT=$(srcdir)/h5importtestutil.sh check_PROGRAMS=$(TEST_PROG) check_SCRIPT=h5importtestutil.sh +SCRIPT_DEPEND=h5import$(EXEEXT) # Our main targets bin_PROGRAMS=h5import diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in index 72fde7d..5ac6c17 100755 --- a/tools/h5import/Makefile.in +++ b/tools/h5import/Makefile.in @@ -316,6 +316,7 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib TEST_PROG = h5importtest TEST_SCRIPT = $(srcdir)/h5importtestutil.sh check_SCRIPT = h5importtestutil.sh +SCRIPT_DEPEND = h5import$(EXEEXT) # All programs depend on the main hdf5 library and the tools library LDADD = $(LIBHDF5) $(LIBH5TOOLS) @@ -739,7 +740,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_: tname=`basename $(@:.chkexe_=)`;\ log=`basename $(@:.chkexe_=.chklog)`; \ echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(@:.chkexe_=); then \ + if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(SCRIPT_DEPEND); then \ echo "No need to test $${tname} again."; \ else \ echo "============================" > $${log}; \ diff --git a/tools/h5jam/Makefile.am b/tools/h5jam/Makefile.am index a6bbfbb..d29ffd0 100644 --- a/tools/h5jam/Makefile.am +++ b/tools/h5jam/Makefile.am @@ -26,6 +26,7 @@ check_PROGRAMS=tellub h5jamgentest getub TEST_SCRIPT=testh5jam.sh check_SCRIPTS=$(TEST_SCRIPT) +SCRIPT_DEPEND=h5jam$(EXEEXT) h5unjam$(EXEEXT) # Link against the main HDF5 library and tools library LDADD=$(LIBH5TOOLS) $(LIBHDF5) diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in index e79995d..9f27f6e 100644 --- a/tools/h5jam/Makefile.in +++ b/tools/h5jam/Makefile.in @@ -327,6 +327,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.h5 *.txt INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib TEST_SCRIPT = testh5jam.sh check_SCRIPTS = $(TEST_SCRIPT) +SCRIPT_DEPEND = h5jam$(EXEEXT) h5unjam$(EXEEXT) # Link against the main HDF5 library and tools library LDADD = $(LIBH5TOOLS) $(LIBHDF5) @@ -766,7 +767,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_: tname=`basename $(@:.chkexe_=)`;\ log=`basename $(@:.chkexe_=.chklog)`; \ echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(@:.chkexe_=); then \ + if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(SCRIPT_DEPEND); then \ echo "No need to test $${tname} again."; \ else \ echo "============================" > $${log}; \ diff --git a/tools/h5ls/Makefile.am b/tools/h5ls/Makefile.am index 89a83a1..7d3e1e7 100644 --- a/tools/h5ls/Makefile.am +++ b/tools/h5ls/Makefile.am @@ -25,6 +25,7 @@ INCLUDES=-I$(top_srcdir)/src -I$(top_srcdir)/tools/lib # Test programs and scripts TEST_SCRIPT=$(srcdir)/testh5ls.sh check_SCRIPTS=$(TEST_SCRIPT) +SCRIPT_DEPEND=h5ls$(EXEEXT) # This is our main target, the h5ls tool bin_PROGRAMS=h5ls diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in index 625779a..aff5bab 100644 --- a/tools/h5ls/Makefile.in +++ b/tools/h5ls/Makefile.in @@ -308,6 +308,7 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib # Test programs and scripts TEST_SCRIPT = $(srcdir)/testh5ls.sh check_SCRIPTS = $(TEST_SCRIPT) +SCRIPT_DEPEND = h5ls$(EXEEXT) # All programs depend on the hdf5 and h5tools libraries LDADD = $(LIBH5TOOLS) $(LIBHDF5) @@ -719,7 +720,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_: tname=`basename $(@:.chkexe_=)`;\ log=`basename $(@:.chkexe_=.chklog)`; \ echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(@:.chkexe_=); then \ + if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(SCRIPT_DEPEND); then \ echo "No need to test $${tname} again."; \ else \ echo "============================" > $${log}; \ diff --git a/tools/h5repack/Makefile.am b/tools/h5repack/Makefile.am index 701eec3..794dd43 100644 --- a/tools/h5repack/Makefile.am +++ b/tools/h5repack/Makefile.am @@ -30,6 +30,8 @@ noinst_PROGRAMS=testh5repack_detect_szip check_SCRIPTS=$(TEST_SCRIPT) check_PROGRAMS=$(TEST_PROG) +SCRIPT_DEPEND=h5repack$(EXEEXT) + # Our main target, h5repack tool bin_PROGRAMS=h5repack diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in index bda6e9c..17d4e59 100644 --- a/tools/h5repack/Makefile.in +++ b/tools/h5repack/Makefile.in @@ -334,6 +334,7 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/tools/lib TEST_SCRIPT = h5repack.sh TEST_PROG = h5repacktst check_SCRIPTS = $(TEST_SCRIPT) +SCRIPT_DEPEND = h5repack$(EXEEXT) # All programs depend on the hdf5 library and the tools library LDADD = $(LIBH5TOOLS) $(LIBHDF5) @@ -796,7 +797,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_: tname=`basename $(@:.chkexe_=)`;\ log=`basename $(@:.chkexe_=.chklog)`; \ echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(@:.chkexe_=); then \ + if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(SCRIPT_DEPEND); then \ echo "No need to test $${tname} again."; \ else \ echo "============================" > $${log}; \ diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in index a200619..fc8784d 100644 --- a/tools/lib/Makefile.in +++ b/tools/lib/Makefile.in @@ -736,7 +736,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_: tname=`basename $(@:.chkexe_=)`;\ log=`basename $(@:.chkexe_=.chklog)`; \ echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(@:.chkexe_=); then \ + if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(SCRIPT_DEPEND); then \ echo "No need to test $${tname} again."; \ else \ echo "============================" > $${log}; \ diff --git a/tools/misc/Makefile.am b/tools/misc/Makefile.am index 2eadd50..b6bf039 100644 --- a/tools/misc/Makefile.am +++ b/tools/misc/Makefile.am @@ -28,6 +28,7 @@ TEST_SCRIPT=testh5repart.sh check_PROGRAMS=$(TEST_PROG) repart_test check_SCRIPTS=$(TEST_SCRIPT) +SCRIPT_DEPEND=h5repart$(EXEEXT) # Build pdb2hdf5 if LLNL's PDB is present (checked in configure) if BUILD_PDB2HDF_CONDITIONAL diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in index 2ffbd3a..66d49a5 100644 --- a/tools/misc/Makefile.in +++ b/tools/misc/Makefile.in @@ -340,6 +340,7 @@ INCLUDES = -I$(top_srcdir)/src TEST_PROG = h5repart_gentest TEST_SCRIPT = testh5repart.sh check_SCRIPTS = $(TEST_SCRIPT) +SCRIPT_DEPEND = h5repart$(EXEEXT) # Build pdb2hdf5 if LLNL's PDB is present (checked in configure) @BUILD_PDB2HDF_CONDITIONAL_TRUE@PDB2HDF = pdb2hdf5 @@ -828,7 +829,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_: tname=`basename $(@:.chkexe_=)`;\ log=`basename $(@:.chkexe_=.chklog)`; \ echo "============================"; \ - if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(@:.chkexe_=); then \ + if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(SCRIPT_DEPEND); then \ echo "No need to test $${tname} again."; \ else \ echo "============================" > $${log}; \ |