summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Laird <jlaird@hdfgroup.org>2005-08-01 22:22:55 (GMT)
committerJames Laird <jlaird@hdfgroup.org>2005-08-01 22:22:55 (GMT)
commitc63ef2cba28df827eb090a019284c7cd8c2982af (patch)
tree134ff7254d8ee7b1c6f7fa3eabc509528899d68d
parentf2240792704b74fc288b4e4a570509c4afe4a34e (diff)
downloadhdf5-c63ef2cba28df827eb090a019284c7cd8c2982af.zip
hdf5-c63ef2cba28df827eb090a019284c7cd8c2982af.tar.gz
hdf5-c63ef2cba28df827eb090a019284c7cd8c2982af.tar.bz2
[svn-r11179] Purpose:
Feature: check-clean target Description: 'make check-clean' cleans up output files from tests. Solution: Tests create foo.chkexe and foo.log files. Scripts create foo.chksh and foo.logsh files. 'make check-clean' will clean these files up so that the tests can be re-run. Also suppressed some not-very-useful output of Makefiles when it would echo commands. Platforms tested: mir, sleipnir, modi4 Misc. update:
-rwxr-xr-xMakefile.am24
-rw-r--r--Makefile.in35
-rw-r--r--c++/Makefile.am10
-rw-r--r--c++/Makefile.in27
-rw-r--r--c++/examples/Makefile.am8
-rw-r--r--c++/examples/Makefile.in30
-rw-r--r--c++/src/Makefile.am2
-rw-r--r--c++/src/Makefile.in19
-rw-r--r--c++/test/Makefile.am2
-rw-r--r--c++/test/Makefile.in19
-rw-r--r--config/commence.am12
-rw-r--r--config/conclude.am6
-rw-r--r--examples/Makefile.am8
-rw-r--r--examples/Makefile.in31
-rw-r--r--fortran/Makefile.am10
-rw-r--r--fortran/Makefile.in27
-rw-r--r--fortran/examples/Makefile.am8
-rw-r--r--fortran/examples/Makefile.in30
-rw-r--r--fortran/src/Makefile.am10
-rw-r--r--fortran/src/Makefile.in32
-rw-r--r--fortran/test/Makefile.am7
-rw-r--r--fortran/test/Makefile.in22
-rw-r--r--fortran/testpar/Makefile.am6
-rw-r--r--fortran/testpar/Makefile.in23
-rwxr-xr-xhl/Makefile.in17
-rw-r--r--hl/c++/Makefile.in17
-rw-r--r--hl/c++/src/Makefile.in17
-rw-r--r--hl/c++/test/Makefile.in17
-rw-r--r--hl/fortran/Makefile.in17
-rw-r--r--hl/fortran/src/Makefile.am8
-rw-r--r--hl/fortran/src/Makefile.in25
-rw-r--r--hl/fortran/test/Makefile.in23
-rw-r--r--hl/src/Makefile.in17
-rw-r--r--hl/test/Makefile.in22
-rw-r--r--hl/tools/gif2h5/Makefile.in17
-rw-r--r--perform/Makefile.in17
-rw-r--r--src/Makefile.in24
-rw-r--r--test/Makefile.in41
-rw-r--r--testpar/Makefile.in22
-rw-r--r--tools/Makefile.in17
-rw-r--r--tools/gifconv/Makefile.in17
-rw-r--r--tools/h5diff/Makefile.in22
-rw-r--r--tools/h5dump/Makefile.in22
-rwxr-xr-xtools/h5import/Makefile.in17
-rw-r--r--tools/h5jam/Makefile.in22
-rw-r--r--tools/h5ls/Makefile.in17
-rw-r--r--tools/h5repack/Makefile.in22
-rw-r--r--tools/lib/Makefile.in17
-rw-r--r--tools/misc/Makefile.am6
-rw-r--r--tools/misc/Makefile.in28
50 files changed, 577 insertions, 339 deletions
diff --git a/Makefile.am b/Makefile.am
index 7374a1c..0e3fea4 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -82,7 +82,7 @@ DISTCLEANFILES=src/H5config.h src/H5pubconf.h config/stamp1 config/stamp2
# These simply involve recursing into subdirectories.
test _test: check
-lib progs check-p check-s:
+lib progs check-p check-s check-clean:
@@SETX@; for d in $(SUBDIRS); do \
if test $$d != .; then \
(cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \
@@ -91,7 +91,7 @@ lib progs check-p check-s:
# Make all, tests, and (un)install also recurse into perform directory
all-local:
- cd perform && $(MAKE) $(AM_MAKEFLAGS) all
+ @cd perform && $(MAKE) $(AM_MAKEFLAGS) all
tests:
@@SETX@; for d in $(SUBDIRS) perform; do \
if test $$d != .; then \
@@ -100,9 +100,9 @@ tests:
done
install-exec-local:
- cd perform && $(MAKE) $(AM_MAKEFLAGS) install
+ @cd perform && $(MAKE) $(AM_MAKEFLAGS) install
uninstall-local:
- cd perform && $(MAKE) $(AM_MAKEFLAGS) uninstall
+ @cd perform && $(MAKE) $(AM_MAKEFLAGS) uninstall
# Clean and mostlyclean need to recurse into examples and perform
# directories unless they've already been distcleaned.
@@ -121,17 +121,17 @@ mostlyclean-local:
(cd $$d && $(MAKE) $(AM_MAKEFLAGS) mostlyclean) || exit 1; \
fi; \
done; \
- if test -d ii_files; then \
+ @if test -d ii_files; then \
$(RM) -rf ii_files; \
fi
# 'make install-all' also installs examples
install-all:
- $(MAKE) $(AM_MAKEFLAGS) install
- $(MAKE) $(AM_MAKEFLAGS) install-examples
+ @$(MAKE) $(AM_MAKEFLAGS) install
+ @$(MAKE) $(AM_MAKEFLAGS) install-examples
uninstall-all:
- $(MAKE) $(AM_MAKEFLAGS) uninstall
- $(MAKE) $(AM_MAKEFLAGS) uninstall-examples
+ @$(MAKE) $(AM_MAKEFLAGS) uninstall
+ @$(MAKE) $(AM_MAKEFLAGS) uninstall-examples
# Install examples in this directory and recursively
install-examples uninstall-examples:
@@ -141,15 +141,15 @@ install-examples uninstall-examples:
# Placeholder to remind users that docs are now in a separate repository.
install-doc:
- echo "docs no longer live in this tree. Use install-examples to install examples."
+ @echo "docs no longer live in this tree. Use install-examples to install examples."
uninstall-doc:
- echo "docs no longer live in this tree. Use install-examples to install examples."
+ @echo "docs no longer live in this tree. Use install-examples to install examples."
# `make check-install' or `make installcheck' checks that examples can
# be successfully built
installcheck-local:
- (cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
+ @(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
# Automake wants to make config.status depend on configure. This
# makes sense, but config.status can't always be regenerated
diff --git a/Makefile.in b/Makefile.in
index 50f5e18..9882685 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -314,13 +314,16 @@ H5FC_PP = $(bindir)/h5pfc
# Serial tests create .log and .logsh files. It's important only to clean log
# files generated by HDF5's tests, because the .log suffix is used for
# other files (e.g., config.log)!
-MOSTLYCLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
+# On the other hand, it is very hard to specify the exact name of .chksh and
+# .logsh files because some scripts live in the source tree, not the build
+# tree. Thus, we clean all .logsh and .chksh files.
+CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
$(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.chksh) \
- $(TEST_SCRIPT_PARA_CHKSH:.chksh_=.chksh) \
$(TEST_PROG_CHKEXE:.chkexe_=.log) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.logsh)
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \
+ *.chksh *.logsh
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES)
@BUILD_PARALLEL_CONDITIONAL_FALSE@TESTPARALLEL_DIR =
# Define subdirectories to build.
@@ -777,7 +780,7 @@ check-install: installcheck
# These simply involve recursing into subdirectories.
test _test: check
-lib progs check-p check-s:
+lib progs check-p check-s check-clean:
@@SETX@; for d in $(SUBDIRS); do \
if test $$d != .; then \
(cd $$d && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1; \
@@ -786,7 +789,7 @@ lib progs check-p check-s:
# Make all, tests, and (un)install also recurse into perform directory
all-local:
- cd perform && $(MAKE) $(AM_MAKEFLAGS) all
+ @cd perform && $(MAKE) $(AM_MAKEFLAGS) all
tests:
@@SETX@; for d in $(SUBDIRS) perform; do \
if test $$d != .; then \
@@ -795,9 +798,9 @@ tests:
done
install-exec-local:
- cd perform && $(MAKE) $(AM_MAKEFLAGS) install
+ @cd perform && $(MAKE) $(AM_MAKEFLAGS) install
uninstall-local:
- cd perform && $(MAKE) $(AM_MAKEFLAGS) uninstall
+ @cd perform && $(MAKE) $(AM_MAKEFLAGS) uninstall
# Clean and mostlyclean need to recurse into examples and perform
# directories unless they've already been distcleaned.
@@ -816,17 +819,17 @@ mostlyclean-local:
(cd $$d && $(MAKE) $(AM_MAKEFLAGS) mostlyclean) || exit 1; \
fi; \
done; \
- if test -d ii_files; then \
+ @if test -d ii_files; then \
$(RM) -rf ii_files; \
fi
# 'make install-all' also installs examples
install-all:
- $(MAKE) $(AM_MAKEFLAGS) install
- $(MAKE) $(AM_MAKEFLAGS) install-examples
+ @$(MAKE) $(AM_MAKEFLAGS) install
+ @$(MAKE) $(AM_MAKEFLAGS) install-examples
uninstall-all:
- $(MAKE) $(AM_MAKEFLAGS) uninstall
- $(MAKE) $(AM_MAKEFLAGS) uninstall-examples
+ @$(MAKE) $(AM_MAKEFLAGS) uninstall
+ @$(MAKE) $(AM_MAKEFLAGS) uninstall-examples
# Install examples in this directory and recursively
install-examples uninstall-examples:
@@ -836,15 +839,15 @@ install-examples uninstall-examples:
# Placeholder to remind users that docs are now in a separate repository.
install-doc:
- echo "docs no longer live in this tree. Use install-examples to install examples."
+ @echo "docs no longer live in this tree. Use install-examples to install examples."
uninstall-doc:
- echo "docs no longer live in this tree. Use install-examples to install examples."
+ @echo "docs no longer live in this tree. Use install-examples to install examples."
# `make check-install' or `make installcheck' checks that examples can
# be successfully built
installcheck-local:
- (cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
+ @(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
# Automake wants to make config.status depend on configure. This
# makes sense, but config.status can't always be regenerated
diff --git a/c++/Makefile.am b/c++/Makefile.am
index a64a215..042fb92 100644
--- a/c++/Makefile.am
+++ b/c++/Makefile.am
@@ -27,23 +27,23 @@ DIST_SUBDIRS = src test examples
# Clean and mostlyclean need to recurse into examples directory
clean-local:
- if test -f examples/Makefile; then \
+ @if test -f examples/Makefile; then \
(cd examples && $(MAKE) $(AM_MAKEFLAGS) clean) || exit 1; \
fi;
mostlyclean-local:
- if test -f examples/Makefile; then \
+ @if test -f examples/Makefile; then \
(cd examples && $(MAKE) $(AM_MAKEFLAGS) mostlyclean) || exit 1; \
fi;
# Install examples
install-examples uninstall-examples:
- (cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
+ @(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
# Check that examples can be successfully built
check-install:
- $(MAKE) $(AM_MAKEFLAGS) installcheck
+ @$(MAKE) $(AM_MAKEFLAGS) installcheck
installcheck-local:
- (cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
+ @(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
include $(top_srcdir)/config/conclude.am
diff --git a/c++/Makefile.in b/c++/Makefile.in
index cbd29d9..12ad160 100644
--- a/c++/Makefile.in
+++ b/c++/Makefile.in
@@ -284,13 +284,16 @@ H5FC_PP = $(bindir)/h5pfc
# Serial tests create .log and .logsh files. It's important only to clean log
# files generated by HDF5's tests, because the .log suffix is used for
# other files (e.g., config.log)!
-MOSTLYCLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
+# On the other hand, it is very hard to specify the exact name of .chksh and
+# .logsh files because some scripts live in the source tree, not the build
+# tree. Thus, we clean all .logsh and .chksh files.
+CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
$(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.chksh) \
- $(TEST_SCRIPT_PARA_CHKSH:.chksh_=.chksh) \
$(TEST_PROG_CHKEXE:.chkexe_=.log) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.logsh)
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \
+ *.chksh *.logsh
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES)
@BUILD_CXX_CONDITIONAL_TRUE@SUBDIRS = src test
DIST_SUBDIRS = src test examples
@@ -632,24 +635,24 @@ check-install: installcheck
# Clean and mostlyclean need to recurse into examples directory
clean-local:
- if test -f examples/Makefile; then \
+ @if test -f examples/Makefile; then \
(cd examples && $(MAKE) $(AM_MAKEFLAGS) clean) || exit 1; \
fi;
mostlyclean-local:
- if test -f examples/Makefile; then \
+ @if test -f examples/Makefile; then \
(cd examples && $(MAKE) $(AM_MAKEFLAGS) mostlyclean) || exit 1; \
fi;
# Install examples
install-examples uninstall-examples:
- (cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
+ @(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
# Check that examples can be successfully built
check-install:
- $(MAKE) $(AM_MAKEFLAGS) installcheck
+ @$(MAKE) $(AM_MAKEFLAGS) installcheck
installcheck-local:
- (cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
+ @(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
# lib/progs/tests targets recurse into subdirectories. build-* targets
# build files in this directory.
@@ -659,7 +662,7 @@ build-lib: $(BUILT_SOURCES) $(LIB)
build-progs: $(BUILT_SOURCES) $(LIB) $(PROGS)
build-tests: $(BUILT_SOURCES) $(LIB) $(PROGS) $(TESTS)
-lib progs tests check-s check-p ::
+lib progs tests check-s check-p check-clean ::
@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
@for d in X $(SUBDIRS); do \
if test $$d != X && test $$d != .; then \
@@ -679,6 +682,10 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
install-doc uninstall-doc:
@echo "Nothing to be done."
+# clean up files generated by tests so they can be re-run.
+build-check-clean:
+ $(RM) $(CHECK_CLEANFILES)
+
# Run each test in order, passing $(TEST_FLAGS) to the program.
# Since tests are done in a shell loop, "make -i" does apply inside it.
# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
diff --git a/c++/examples/Makefile.am b/c++/examples/Makefile.am
index 23757b3..f1664ff 100644
--- a/c++/examples/Makefile.am
+++ b/c++/examples/Makefile.am
@@ -56,9 +56,9 @@ $(EXAMPLEDIR):
-$(top_srcdir)/bin/mkdirs $@
install-data-local:
- $(MAKE) install-examples
+ @$(MAKE) install-examples
uninstall-local:
- $(MAKE) uninstall-examples
+ @$(MAKE) uninstall-examples
# Install source files, which are the examples with .cpp suffixes. Do the same
# for uninstall.
@@ -75,9 +75,9 @@ uninstall-examples:
fi
check-install:
- $(MAKE) installcheck
+ @$(MAKE) $(AM_MAKEFLAGS) installcheck
installcheck-local:
- $(MAKE) check
+ @$(MAKE) $(AM_MAKEFLAGS) check
# How to build programs using h5c++
$(EXTRA_PROG): $(H5CPP) $(LIBHDF5) $(LIBH5CPP)
diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in
index 687e5b0..7d8ba45 100644
--- a/c++/examples/Makefile.in
+++ b/c++/examples/Makefile.in
@@ -276,16 +276,20 @@ H5FC_PP = $(bindir)/h5pfc
# Serial tests create .log and .logsh files. It's important only to clean log
# files generated by HDF5's tests, because the .log suffix is used for
# other files (e.g., config.log)!
+# On the other hand, it is very hard to specify the exact name of .chksh and
+# .logsh files because some scripts live in the source tree, not the build
+# tree. Thus, we clean all .logsh and .chksh files.
+CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
+ $(TEST_PROG_CHKEXE:.chkexe_=.log) \
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \
+ *.chksh *.logsh
+
# These are the files that 'make clean' (and derivatives) will remove from this
# directory. Since automake doesn't know about the examples, we need to
# tell it to clean the example programs, too.
-MOSTLYCLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.chksh) \
- $(TEST_SCRIPT_PARA_CHKSH:.chksh_=.chksh) \
- $(TEST_PROG_CHKEXE:.chkexe_=.log) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.logsh) *.h5 $(EXTRA_PROG:=.o)
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES) *.h5 $(EXTRA_PROG:=.o)
# Use h5c++ to build examples, instead of reguar C++ compiler
H5CPP = $(bindir)/h5c++
@@ -506,9 +510,9 @@ $(EXAMPLEDIR):
-$(top_srcdir)/bin/mkdirs $@
install-data-local:
- $(MAKE) install-examples
+ @$(MAKE) install-examples
uninstall-local:
- $(MAKE) uninstall-examples
+ @$(MAKE) uninstall-examples
# Install source files, which are the examples with .cpp suffixes. Do the same
# for uninstall.
@@ -525,9 +529,9 @@ uninstall-examples:
fi
check-install:
- $(MAKE) installcheck
+ @$(MAKE) $(AM_MAKEFLAGS) installcheck
installcheck-local:
- $(MAKE) check
+ @$(MAKE) $(AM_MAKEFLAGS) check
# How to build programs using h5c++
$(EXTRA_PROG): $(H5CPP) $(LIBHDF5) $(LIBH5CPP)
@@ -553,7 +557,7 @@ build-lib: $(BUILT_SOURCES) $(LIB)
build-progs: $(BUILT_SOURCES) $(LIB) $(PROGS)
build-tests: $(BUILT_SOURCES) $(LIB) $(PROGS) $(TESTS)
-lib progs tests check-s check-p ::
+lib progs tests check-s check-p check-clean ::
@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
@for d in X $(SUBDIRS); do \
if test $$d != X && test $$d != .; then \
@@ -573,6 +577,10 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
install-doc uninstall-doc:
@echo "Nothing to be done."
+# clean up files generated by tests so they can be re-run.
+build-check-clean:
+ $(RM) $(CHECK_CLEANFILES)
+
# Run each test in order, passing $(TEST_FLAGS) to the program.
# Since tests are done in a shell loop, "make -i" does apply inside it.
# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
diff --git a/c++/src/Makefile.am b/c++/src/Makefile.am
index 5c9a2de..1cd499c 100644
--- a/c++/src/Makefile.am
+++ b/c++/src/Makefile.am
@@ -57,7 +57,7 @@ DISTCLEANFILES=h5c++ libhdf5.settings
# holds *.ii files, which are template entity instantiations.
# This entire directory should be cleaned.
mostlyclean-local:
- if test -d ii_files; then \
+ @if test -d ii_files; then \
$(RM) -rf ii_files; \
fi
diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in
index ffea11b..eed8cba 100644
--- a/c++/src/Makefile.in
+++ b/c++/src/Makefile.in
@@ -318,13 +318,16 @@ H5FC_PP = $(bindir)/h5pfc
# Serial tests create .log and .logsh files. It's important only to clean log
# files generated by HDF5's tests, because the .log suffix is used for
# other files (e.g., config.log)!
-MOSTLYCLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
+# On the other hand, it is very hard to specify the exact name of .chksh and
+# .logsh files because some scripts live in the source tree, not the build
+# tree. Thus, we clean all .logsh and .chksh files.
+CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
$(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.chksh) \
- $(TEST_SCRIPT_PARA_CHKSH:.chksh_=.chksh) \
$(TEST_PROG_CHKEXE:.chkexe_=.log) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.logsh)
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \
+ *.chksh *.logsh
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES)
# Include src directory
INCLUDES = -I$(top_srcdir)/src
@@ -733,7 +736,7 @@ check-install: installcheck
# holds *.ii files, which are template entity instantiations.
# This entire directory should be cleaned.
mostlyclean-local:
- if test -d ii_files; then \
+ @if test -d ii_files; then \
$(RM) -rf ii_files; \
fi
@@ -745,7 +748,7 @@ build-lib: $(BUILT_SOURCES) $(LIB)
build-progs: $(BUILT_SOURCES) $(LIB) $(PROGS)
build-tests: $(BUILT_SOURCES) $(LIB) $(PROGS) $(TESTS)
-lib progs tests check-s check-p ::
+lib progs tests check-s check-p check-clean ::
@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
@for d in X $(SUBDIRS); do \
if test $$d != X && test $$d != .; then \
@@ -765,6 +768,10 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
install-doc uninstall-doc:
@echo "Nothing to be done."
+# clean up files generated by tests so they can be re-run.
+build-check-clean:
+ $(RM) $(CHECK_CLEANFILES)
+
# Run each test in order, passing $(TEST_FLAGS) to the program.
# Since tests are done in a shell loop, "make -i" does apply inside it.
# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
diff --git a/c++/test/Makefile.am b/c++/test/Makefile.am
index 43194e5..8d2627a 100644
--- a/c++/test/Makefile.am
+++ b/c++/test/Makefile.am
@@ -43,7 +43,7 @@ HDF_CXX=yes
# holds *.ii files, which are template entity instantiations.
# This entire directory should be cleaned.
mostlyclean-local:
- if test -d ii_files; then \
+ @if test -d ii_files; then \
$(RM) -rf ii_files; \
fi
diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in
index 5167c34..8c8e472 100644
--- a/c++/test/Makefile.in
+++ b/c++/test/Makefile.in
@@ -307,13 +307,16 @@ H5FC_PP = $(bindir)/h5pfc
# Serial tests create .log and .logsh files. It's important only to clean log
# files generated by HDF5's tests, because the .log suffix is used for
# other files (e.g., config.log)!
-MOSTLYCLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
+# On the other hand, it is very hard to specify the exact name of .chksh and
+# .logsh files because some scripts live in the source tree, not the build
+# tree. Thus, we clean all .logsh and .chksh files.
+CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
$(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.chksh) \
- $(TEST_SCRIPT_PARA_CHKSH:.chksh_=.chksh) \
$(TEST_PROG_CHKEXE:.chkexe_=.log) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.logsh)
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \
+ *.chksh *.logsh
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES)
# Include src, test, and c++/src directories
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/c++/src
@@ -621,7 +624,7 @@ check-install: installcheck
# holds *.ii files, which are template entity instantiations.
# This entire directory should be cleaned.
mostlyclean-local:
- if test -d ii_files; then \
+ @if test -d ii_files; then \
$(RM) -rf ii_files; \
fi
@@ -633,7 +636,7 @@ build-lib: $(BUILT_SOURCES) $(LIB)
build-progs: $(BUILT_SOURCES) $(LIB) $(PROGS)
build-tests: $(BUILT_SOURCES) $(LIB) $(PROGS) $(TESTS)
-lib progs tests check-s check-p ::
+lib progs tests check-s check-p check-clean ::
@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
@for d in X $(SUBDIRS); do \
if test $$d != X && test $$d != .; then \
@@ -653,6 +656,10 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
install-doc uninstall-doc:
@echo "Nothing to be done."
+# clean up files generated by tests so they can be re-run.
+build-check-clean:
+ $(RM) $(CHECK_CLEANFILES)
+
# Run each test in order, passing $(TEST_FLAGS) to the program.
# Since tests are done in a shell loop, "make -i" does apply inside it.
# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
diff --git a/config/commence.am b/config/commence.am
index fc13cfb..3325efb 100644
--- a/config/commence.am
+++ b/config/commence.am
@@ -57,12 +57,16 @@ AUTOCONF=/afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf
# Serial tests create .log and .logsh files. It's important only to clean log
# files generated by HDF5's tests, because the .log suffix is used for
# other files (e.g., config.log)!
-MOSTLYCLEANFILES=$(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
+# On the other hand, it is very hard to specify the exact name of .chksh and
+# .logsh files because some scripts live in the source tree, not the build
+# tree. Thus, we clean all .logsh and .chksh files.
+CHECK_CLEANFILES=$(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
$(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.chksh) \
- $(TEST_SCRIPT_PARA_CHKSH:.chksh_=.chksh) \
$(TEST_PROG_CHKEXE:.chkexe_=.log) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.logsh)
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \
+ *.chksh *.logsh
+
+MOSTLYCLEANFILES=$(CHECK_CLEANFILES)
# check-install is a synonym for installcheck.
# Add this build rule here (rather than in conclude.am, where build rules
diff --git a/config/conclude.am b/config/conclude.am
index 9553fce..4204d74 100644
--- a/config/conclude.am
+++ b/config/conclude.am
@@ -22,7 +22,7 @@ build-lib: $(BUILT_SOURCES) $(LIB)
build-progs: $(BUILT_SOURCES) $(LIB) $(PROGS)
build-tests: $(BUILT_SOURCES) $(LIB) $(PROGS) $(TESTS)
-lib progs tests check-s check-p ::
+lib progs tests check-s check-p check-clean ::
@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
@for d in X $(SUBDIRS); do \
if test $$d != X && test $$d != .; then \
@@ -42,6 +42,10 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
install-doc uninstall-doc:
@echo "Nothing to be done."
+# clean up files generated by tests so they can be re-run.
+build-check-clean:
+ $(RM) $(CHECK_CLEANFILES)
+
# Run each test in order, passing $(TEST_FLAGS) to the program.
# Since tests are done in a shell loop, "make -i" does apply inside it.
# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 1e4b883..31e1d7a 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -70,9 +70,9 @@ $(EXAMPLEDIR):
-$(top_srcdir)/bin/mkdirs $@
install-data-local:
- $(MAKE) $(AM_MAKEFLAGS) install-examples
+ @$(MAKE) $(AM_MAKEFLAGS) install-examples
uninstall-local:
- $(MAKE) $(AM_MAKEFLAGS) uninstall-examples
+ @$(MAKE) $(AM_MAKEFLAGS) uninstall-examples
# We want to install the source files, not the examples themselves. Add '.c' to
# each example to get its source. This is a bit kludgy.
@@ -89,9 +89,9 @@ uninstall-examples:
fi
check-install:
- $(MAKE) $(AM_MAKEFLAGS) installcheck
+ @$(MAKE) $(AM_MAKEFLAGS) installcheck
installcheck-local:
- $(MAKE) $(AM_MAKEFLAGS) check
+ @$(MAKE) $(AM_MAKEFLAGS) check
# List dependencies for each program. Normally, automake would take
# care of this for us, but if we tell automake about the programs it
diff --git a/examples/Makefile.in b/examples/Makefile.in
index dfac23d..77a8d93 100644
--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@@ -276,15 +276,18 @@ H5FC_PP = $(bindir)/h5pfc
# Serial tests create .log and .logsh files. It's important only to clean log
# files generated by HDF5's tests, because the .log suffix is used for
# other files (e.g., config.log)!
+# On the other hand, it is very hard to specify the exact name of .chksh and
+# .logsh files because some scripts live in the source tree, not the build
+# tree. Thus, we clean all .logsh and .chksh files.
+CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
+ $(TEST_PROG_CHKEXE:.chkexe_=.log) \
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \
+ *.chksh *.logsh
+
# We need to tell automake what to clean
-MOSTLYCLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.chksh) \
- $(TEST_SCRIPT_PARA_CHKSH:.chksh_=.chksh) \
- $(TEST_PROG_CHKEXE:.chkexe_=.log) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.logsh) *.h5 *.raw *.meta *.clog \
- *.o
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES) *.h5 *.raw *.meta *.clog *.o
@BUILD_PARALLEL_CONDITIONAL_TRUE@TEST_PROG_PARA = ph5example
# Example programs.
@@ -517,9 +520,9 @@ $(EXAMPLEDIR):
-$(top_srcdir)/bin/mkdirs $@
install-data-local:
- $(MAKE) $(AM_MAKEFLAGS) install-examples
+ @$(MAKE) $(AM_MAKEFLAGS) install-examples
uninstall-local:
- $(MAKE) $(AM_MAKEFLAGS) uninstall-examples
+ @$(MAKE) $(AM_MAKEFLAGS) uninstall-examples
# We want to install the source files, not the examples themselves. Add '.c' to
# each example to get its source. This is a bit kludgy.
@@ -536,9 +539,9 @@ uninstall-examples:
fi
check-install:
- $(MAKE) $(AM_MAKEFLAGS) installcheck
+ @$(MAKE) $(AM_MAKEFLAGS) installcheck
installcheck-local:
- $(MAKE) $(AM_MAKEFLAGS) check
+ @$(MAKE) $(AM_MAKEFLAGS) check
# List dependencies for each program. Normally, automake would take
# care of this for us, but if we tell automake about the programs it
@@ -568,7 +571,7 @@ build-lib: $(BUILT_SOURCES) $(LIB)
build-progs: $(BUILT_SOURCES) $(LIB) $(PROGS)
build-tests: $(BUILT_SOURCES) $(LIB) $(PROGS) $(TESTS)
-lib progs tests check-s check-p ::
+lib progs tests check-s check-p check-clean ::
@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
@for d in X $(SUBDIRS); do \
if test $$d != X && test $$d != .; then \
@@ -588,6 +591,10 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
install-doc uninstall-doc:
@echo "Nothing to be done."
+# clean up files generated by tests so they can be re-run.
+build-check-clean:
+ $(RM) $(CHECK_CLEANFILES)
+
# Run each test in order, passing $(TEST_FLAGS) to the program.
# Since tests are done in a shell loop, "make -i" does apply inside it.
# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
diff --git a/fortran/Makefile.am b/fortran/Makefile.am
index dce1857..9a988d9 100644
--- a/fortran/Makefile.am
+++ b/fortran/Makefile.am
@@ -38,24 +38,24 @@ DIST_SUBDIRS=src test testpar examples
# Clean and mostlyclean need to recurse into examples directory
clean-local:
- if test -f examples/Makefile; then \
+ @if test -f examples/Makefile; then \
(cd examples && $(MAKE) $(AM_MAKEFLAGS) clean) || exit 1; \
fi;
mostlyclean-local:
- if test -f examples/Makefile; then \
+ @if test -f examples/Makefile; then \
(cd examples && $(MAKE) $(AM_MAKEFLAGS) mostlyclean) || exit 1; \
fi;
# Install examples
install-examples uninstall-examples:
- (cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
+ @(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
# Check that examples can be successfully built
check-install:
- $(MAKE) $(AM_MAKEFLAGS) installcheck
+ @$(MAKE) $(AM_MAKEFLAGS) installcheck
installcheck-local:
- (cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
+ @(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
include $(top_srcdir)/config/conclude.am
diff --git a/fortran/Makefile.in b/fortran/Makefile.in
index 127300a..b2da807 100644
--- a/fortran/Makefile.in
+++ b/fortran/Makefile.in
@@ -288,13 +288,16 @@ H5FC_PP = $(bindir)/h5pfc
# Serial tests create .log and .logsh files. It's important only to clean log
# files generated by HDF5's tests, because the .log suffix is used for
# other files (e.g., config.log)!
-MOSTLYCLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
+# On the other hand, it is very hard to specify the exact name of .chksh and
+# .logsh files because some scripts live in the source tree, not the build
+# tree. Thus, we clean all .logsh and .chksh files.
+CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
$(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.chksh) \
- $(TEST_SCRIPT_PARA_CHKSH:.chksh_=.chksh) \
$(TEST_PROG_CHKEXE:.chkexe_=.log) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.logsh)
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \
+ *.chksh *.logsh
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES)
@BUILD_PARALLEL_CONDITIONAL_TRUE@TESTPARALLEL_DIR = testpar
# Subdirectories in build order, not including examples directory
@@ -641,24 +644,24 @@ check-install: installcheck
# Clean and mostlyclean need to recurse into examples directory
clean-local:
- if test -f examples/Makefile; then \
+ @if test -f examples/Makefile; then \
(cd examples && $(MAKE) $(AM_MAKEFLAGS) clean) || exit 1; \
fi;
mostlyclean-local:
- if test -f examples/Makefile; then \
+ @if test -f examples/Makefile; then \
(cd examples && $(MAKE) $(AM_MAKEFLAGS) mostlyclean) || exit 1; \
fi;
# Install examples
install-examples uninstall-examples:
- (cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
+ @(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
# Check that examples can be successfully built
check-install:
- $(MAKE) $(AM_MAKEFLAGS) installcheck
+ @$(MAKE) $(AM_MAKEFLAGS) installcheck
installcheck-local:
- (cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
+ @(cd examples && $(MAKE) $(AM_MAKEFLAGS) $@) || exit 1;
# lib/progs/tests targets recurse into subdirectories. build-* targets
# build files in this directory.
@@ -668,7 +671,7 @@ build-lib: $(BUILT_SOURCES) $(LIB)
build-progs: $(BUILT_SOURCES) $(LIB) $(PROGS)
build-tests: $(BUILT_SOURCES) $(LIB) $(PROGS) $(TESTS)
-lib progs tests check-s check-p ::
+lib progs tests check-s check-p check-clean ::
@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
@for d in X $(SUBDIRS); do \
if test $$d != X && test $$d != .; then \
@@ -688,6 +691,10 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
install-doc uninstall-doc:
@echo "Nothing to be done."
+# clean up files generated by tests so they can be re-run.
+build-check-clean:
+ $(RM) $(CHECK_CLEANFILES)
+
# Run each test in order, passing $(TEST_FLAGS) to the program.
# Since tests are done in a shell loop, "make -i" does apply inside it.
# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
diff --git a/fortran/examples/Makefile.am b/fortran/examples/Makefile.am
index f01629a..09fe83c 100644
--- a/fortran/examples/Makefile.am
+++ b/fortran/examples/Makefile.am
@@ -75,9 +75,9 @@ $(EXAMPLEDIR):
-$(top_srcdir)/bin/mkdirs $@
install-data-local:
- $(MAKE) install-examples
+ @$(MAKE) install-examples
uninstall-local:
- $(MAKE) uninstall-examples
+ @$(MAKE) uninstall-examples
# We're installing source files, not the example programs. Add .f90 to each
# example program to get its source (and do the same when uninstalling).
@@ -94,9 +94,9 @@ uninstall-examples:
fi
check-install:
- $(MAKE) installcheck
+ @$(MAKE) installcheck
installcheck-local:
- $(MAKE) check
+ @$(MAKE) check
# List dependencies for each example. Normally, automake would take
# care of this for us, but if we tell automake about the programs it
diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in
index b9404dc..df2a7fb 100644
--- a/fortran/examples/Makefile.in
+++ b/fortran/examples/Makefile.in
@@ -276,14 +276,18 @@ H5FC_PP = $(bindir)/h5pfc
# Serial tests create .log and .logsh files. It's important only to clean log
# files generated by HDF5's tests, because the .log suffix is used for
# other files (e.g., config.log)!
+# On the other hand, it is very hard to specify the exact name of .chksh and
+# .logsh files because some scripts live in the source tree, not the build
+# tree. Thus, we clean all .logsh and .chksh files.
+CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
+ $(TEST_PROG_CHKEXE:.chkexe_=.log) \
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \
+ *.chksh *.logsh
+
# Tell automake which files to clean
-MOSTLYCLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.chksh) \
- $(TEST_SCRIPT_PARA_CHKSH:.chksh_=.chksh) \
- $(TEST_PROG_CHKEXE:.chkexe_=.log) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.logsh) $(EXTRA_PROG:=.o)
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES) $(EXTRA_PROG:=.o)
# Compile parallel fortran examples only if parallel is enabled
@BUILD_PARALLEL_CONDITIONAL_TRUE@TEST_PROG_PARA = ph5example
@@ -522,9 +526,9 @@ $(EXAMPLEDIR):
-$(top_srcdir)/bin/mkdirs $@
install-data-local:
- $(MAKE) install-examples
+ @$(MAKE) install-examples
uninstall-local:
- $(MAKE) uninstall-examples
+ @$(MAKE) uninstall-examples
# We're installing source files, not the example programs. Add .f90 to each
# example program to get its source (and do the same when uninstalling).
@@ -541,9 +545,9 @@ uninstall-examples:
fi
check-install:
- $(MAKE) installcheck
+ @$(MAKE) installcheck
installcheck-local:
- $(MAKE) check
+ @$(MAKE) check
# List dependencies for each example. Normally, automake would take
# care of this for us, but if we tell automake about the programs it
@@ -575,7 +579,7 @@ build-lib: $(BUILT_SOURCES) $(LIB)
build-progs: $(BUILT_SOURCES) $(LIB) $(PROGS)
build-tests: $(BUILT_SOURCES) $(LIB) $(PROGS) $(TESTS)
-lib progs tests check-s check-p ::
+lib progs tests check-s check-p check-clean ::
@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
@for d in X $(SUBDIRS); do \
if test $$d != X && test $$d != .; then \
@@ -595,6 +599,10 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
install-doc uninstall-doc:
@echo "Nothing to be done."
+# clean up files generated by tests so they can be re-run.
+build-check-clean:
+ $(RM) $(CHECK_CLEANFILES)
+
# Run each test in order, passing $(TEST_FLAGS) to the program.
# Since tests are done in a shell loop, "make -i" does apply inside it.
# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
diff --git a/fortran/src/Makefile.am b/fortran/src/Makefile.am
index cc46d1c..8b7a1f5 100644
--- a/fortran/src/Makefile.am
+++ b/fortran/src/Makefile.am
@@ -65,26 +65,26 @@ MOSTLYCLEANFILES+=H5fortran_types.f90 H5f90i_gen.h H5fort_type_defines.h \
maintainer-clean-local: clean-local
distclean-local: clean-local
clean-local:
- if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \
+ @if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \
$(RM) *.$(F9XMODEXT); \
fi
install-data-local:
- if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \
+ @if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \
$(CP) $(top_builddir)/$(subdir)/*.$(F9XMODEXT) $(includedir)/. ; \
fi
uninstall-local:
- if test -n "$(F9XMODEXT)" -a "X$(F9XMODEXT)" != "Xo"; then \
+ @if test -n "$(F9XMODEXT)" -a "X$(F9XMODEXT)" != "Xo"; then \
if test -f "$(includedir)/hdf5.$(F9XMODEXT)" -o -f "$(includedir)/HDF5.$(F9XMODEXT)"; then \
set -x; $(RM) $(includedir)/*.$(F9XMODEXT); \
fi; \
fi; \
- $(RM) $(bindir)/$(H5FC_NAME)
+ @$(RM) $(bindir)/$(H5FC_NAME)
# Also install and uninstall (uninstall-local above) h5fc script
install-exec-local:
- $(INSTALL) h5fc $(bindir)/$(H5FC_NAME)
+ @$(INSTALL) h5fc $(bindir)/$(H5FC_NAME)
# Install libhdf5_fortran.settings in lib directory
settingsdir=$(libdir)
diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in
index 5fb6ecf..9226e92 100644
--- a/fortran/src/Makefile.in
+++ b/fortran/src/Makefile.in
@@ -343,16 +343,20 @@ H5FC_PP = $(bindir)/h5pfc
# Serial tests create .log and .logsh files. It's important only to clean log
# files generated by HDF5's tests, because the .log suffix is used for
# other files (e.g., config.log)!
+# On the other hand, it is very hard to specify the exact name of .chksh and
+# .logsh files because some scripts live in the source tree, not the build
+# tree. Thus, we clean all .logsh and .chksh files.
+CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
+ $(TEST_PROG_CHKEXE:.chkexe_=.log) \
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \
+ *.chksh *.logsh
+
# H5fortran_types.f90 and H5f90i.h are automatically generaed by
# H5match_types, and must be cleaned explicitly. H5fort_type_defines.h
# is generated by H5fortran_detect
-MOSTLYCLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.chksh) \
- $(TEST_SCRIPT_PARA_CHKSH:.chksh_=.chksh) \
- $(TEST_PROG_CHKEXE:.chkexe_=.log) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.logsh) H5fortran_types.f90 \
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES) H5fortran_types.f90 \
H5f90i_gen.h H5fort_type_defines.h H5fortran_detect.f90
# Include src directory in both Fortran and C flags (C compiler is used
@@ -786,26 +790,26 @@ check-install: installcheck
maintainer-clean-local: clean-local
distclean-local: clean-local
clean-local:
- if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \
+ @if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \
$(RM) *.$(F9XMODEXT); \
fi
install-data-local:
- if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \
+ @if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \
$(CP) $(top_builddir)/$(subdir)/*.$(F9XMODEXT) $(includedir)/. ; \
fi
uninstall-local:
- if test -n "$(F9XMODEXT)" -a "X$(F9XMODEXT)" != "Xo"; then \
+ @if test -n "$(F9XMODEXT)" -a "X$(F9XMODEXT)" != "Xo"; then \
if test -f "$(includedir)/hdf5.$(F9XMODEXT)" -o -f "$(includedir)/HDF5.$(F9XMODEXT)"; then \
set -x; $(RM) $(includedir)/*.$(F9XMODEXT); \
fi; \
fi; \
- $(RM) $(bindir)/$(H5FC_NAME)
+ @$(RM) $(bindir)/$(H5FC_NAME)
# Also install and uninstall (uninstall-local above) h5fc script
install-exec-local:
- $(INSTALL) h5fc $(bindir)/$(H5FC_NAME)
+ @$(INSTALL) h5fc $(bindir)/$(H5FC_NAME)
#Specify what Automake needs to create: first the H5fort_type_defines.h
# header, then H5match_types which includes that header, then
@@ -860,7 +864,7 @@ build-lib: $(BUILT_SOURCES) $(LIB)
build-progs: $(BUILT_SOURCES) $(LIB) $(PROGS)
build-tests: $(BUILT_SOURCES) $(LIB) $(PROGS) $(TESTS)
-lib progs tests check-s check-p ::
+lib progs tests check-s check-p check-clean ::
@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
@for d in X $(SUBDIRS); do \
if test $$d != X && test $$d != .; then \
@@ -880,6 +884,10 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
install-doc uninstall-doc:
@echo "Nothing to be done."
+# clean up files generated by tests so they can be re-run.
+build-check-clean:
+ $(RM) $(CHECK_CLEANFILES)
+
# Run each test in order, passing $(TEST_FLAGS) to the program.
# Since tests are done in a shell loop, "make -i" does apply inside it.
# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
diff --git a/fortran/test/Makefile.am b/fortran/test/Makefile.am
index 2370590..6ecee2f 100644
--- a/fortran/test/Makefile.am
+++ b/fortran/test/Makefile.am
@@ -61,11 +61,4 @@ MOSTLYCLEANFILES+=*.h5 *.tmp
# from tests in conclude.am)
HDF_FORTRAN=yes
-## Fortran dependencies must be hardcoded, unfortunately.
-##FORTLIBTEST_OBJ= fortranlib_test.lo \
-## tH5F.lo tH5D.lo tH5R.lo tH5S.lo tH5T.lo tH5VL.lo tH5Z.lo \
-## tH5Sselect.lo tH5P.lo tH5A.lo tH5I.lo tH5G.lo tH5E.lo tf.lo \
-## t.lo
-##fortranlib_test$(EXEEXT): $(FORTLIBTEST_OBJ)
-
include $(top_srcdir)/config/conclude.am
diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in
index 06dbb96..66dad14 100644
--- a/fortran/test/Makefile.in
+++ b/fortran/test/Makefile.in
@@ -345,14 +345,18 @@ H5FC_PP = $(bindir)/h5pfc
# Serial tests create .log and .logsh files. It's important only to clean log
# files generated by HDF5's tests, because the .log suffix is used for
# other files (e.g., config.log)!
+# On the other hand, it is very hard to specify the exact name of .chksh and
+# .logsh files because some scripts live in the source tree, not the build
+# tree. Thus, we clean all .logsh and .chksh files.
+CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
+ $(TEST_PROG_CHKEXE:.chkexe_=.log) \
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \
+ *.chksh *.logsh
+
# Temporary files
-MOSTLYCLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.chksh) \
- $(TEST_SCRIPT_PARA_CHKSH:.chksh_=.chksh) \
- $(TEST_PROG_CHKEXE:.chkexe_=.log) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.logsh) *.h5 *.tmp
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES) *.h5 *.tmp
# Include files
AM_FCFLAGS = -I$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/src
@@ -829,7 +833,7 @@ build-lib: $(BUILT_SOURCES) $(LIB)
build-progs: $(BUILT_SOURCES) $(LIB) $(PROGS)
build-tests: $(BUILT_SOURCES) $(LIB) $(PROGS) $(TESTS)
-lib progs tests check-s check-p ::
+lib progs tests check-s check-p check-clean ::
@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
@for d in X $(SUBDIRS); do \
if test $$d != X && test $$d != .; then \
@@ -849,6 +853,10 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
install-doc uninstall-doc:
@echo "Nothing to be done."
+# clean up files generated by tests so they can be re-run.
+build-check-clean:
+ $(RM) $(CHECK_CLEANFILES)
+
# Run each test in order, passing $(TEST_FLAGS) to the program.
# Since tests are done in a shell loop, "make -i" does apply inside it.
# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
diff --git a/fortran/testpar/Makefile.am b/fortran/testpar/Makefile.am
index 75c1588..30cf60b 100644
--- a/fortran/testpar/Makefile.am
+++ b/fortran/testpar/Makefile.am
@@ -42,10 +42,4 @@ LDADD=$(LIBH5FTEST) $(LIBH5TEST) $(LIBH5F) $(LIBHDF5)
# Mark this directory as part of the Fortran API
HDF_FORTRAN=yes
-# Put in dependencies to the THDF5 module so that things will be built
-# in the correct order.
-#thdf5.lo: thdf5.o
-#thyperslab_wr.o: $(srcdir)/thyperslab_wr.f90 thdf5.lo
-#ptesthdf5_fortran.o: $(srcdir)/ptesthdf5_fortran.f90 thdf5.lo
-
include $(top_srcdir)/config/conclude.am
diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in
index 374c2cb..4c0ebd7 100644
--- a/fortran/testpar/Makefile.in
+++ b/fortran/testpar/Makefile.in
@@ -300,13 +300,16 @@ H5FC_PP = $(bindir)/h5pfc
# Serial tests create .log and .logsh files. It's important only to clean log
# files generated by HDF5's tests, because the .log suffix is used for
# other files (e.g., config.log)!
-MOSTLYCLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
+# On the other hand, it is very hard to specify the exact name of .chksh and
+# .logsh files because some scripts live in the source tree, not the build
+# tree. Thus, we clean all .logsh and .chksh files.
+CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
$(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.chksh) \
- $(TEST_SCRIPT_PARA_CHKSH:.chksh_=.chksh) \
$(TEST_PROG_CHKEXE:.chkexe_=.log) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.logsh)
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \
+ *.chksh *.logsh
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES)
# Include files
AM_FCFLAGS = -I$(top_srcdir)/fortran/src -I$(top_srcdir)/fortran/test $(F9XMODFLAG)$(top_builddir)/fortran/src
@@ -598,7 +601,7 @@ build-lib: $(BUILT_SOURCES) $(LIB)
build-progs: $(BUILT_SOURCES) $(LIB) $(PROGS)
build-tests: $(BUILT_SOURCES) $(LIB) $(PROGS) $(TESTS)
-lib progs tests check-s check-p ::
+lib progs tests check-s check-p check-clean ::
@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
@for d in X $(SUBDIRS); do \
if test $$d != X && test $$d != .; then \
@@ -618,6 +621,10 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
install-doc uninstall-doc:
@echo "Nothing to be done."
+# clean up files generated by tests so they can be re-run.
+build-check-clean:
+ $(RM) $(CHECK_CLEANFILES)
+
# Run each test in order, passing $(TEST_FLAGS) to the program.
# Since tests are done in a shell loop, "make -i" does apply inside it.
# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
@@ -760,12 +767,6 @@ check-vfd:
HDF5_DRIVER=$$vfd $(MAKE) $(AM_MAKEFLAGS) check; \
fi; \
done
-
-# Put in dependencies to the THDF5 module so that things will be built
-# in the correct order.
-#thdf5.lo: thdf5.o
-#thyperslab_wr.o: $(srcdir)/thyperslab_wr.f90 thdf5.lo
-#ptesthdf5_fortran.o: $(srcdir)/ptesthdf5_fortran.f90 thdf5.lo
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/hl/Makefile.in b/hl/Makefile.in
index 5e6b384..7ca0077 100755
--- a/hl/Makefile.in
+++ b/hl/Makefile.in
@@ -280,13 +280,16 @@ H5FC_PP = $(bindir)/h5pfc
# Serial tests create .log and .logsh files. It's important only to clean log
# files generated by HDF5's tests, because the .log suffix is used for
# other files (e.g., config.log)!
-MOSTLYCLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
+# On the other hand, it is very hard to specify the exact name of .chksh and
+# .logsh files because some scripts live in the source tree, not the build
+# tree. Thus, we clean all .logsh and .chksh files.
+CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
$(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.chksh) \
- $(TEST_SCRIPT_PARA_CHKSH:.chksh_=.chksh) \
$(TEST_PROG_CHKEXE:.chkexe_=.log) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.logsh)
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \
+ *.chksh *.logsh
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES)
@BUILD_FORTRAN_CONDITIONAL_TRUE@FORTRAN_DIR = fortran
@BUILD_CXX_CONDITIONAL_TRUE@CXX_DIR = c++
@BUILD_HDF5_HL_CONDITIONAL_TRUE@SUBDIRS = src test $(CXX_DIR) $(FORTRAN_DIR)
@@ -633,7 +636,7 @@ build-lib: $(BUILT_SOURCES) $(LIB)
build-progs: $(BUILT_SOURCES) $(LIB) $(PROGS)
build-tests: $(BUILT_SOURCES) $(LIB) $(PROGS) $(TESTS)
-lib progs tests check-s check-p ::
+lib progs tests check-s check-p check-clean ::
@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
@for d in X $(SUBDIRS); do \
if test $$d != X && test $$d != .; then \
@@ -653,6 +656,10 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
install-doc uninstall-doc:
@echo "Nothing to be done."
+# clean up files generated by tests so they can be re-run.
+build-check-clean:
+ $(RM) $(CHECK_CLEANFILES)
+
# Run each test in order, passing $(TEST_FLAGS) to the program.
# Since tests are done in a shell loop, "make -i" does apply inside it.
# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in
index b5fb124..7da55eb 100644
--- a/hl/c++/Makefile.in
+++ b/hl/c++/Makefile.in
@@ -285,13 +285,16 @@ H5FC_PP = $(bindir)/h5pfc
# Serial tests create .log and .logsh files. It's important only to clean log
# files generated by HDF5's tests, because the .log suffix is used for
# other files (e.g., config.log)!
-MOSTLYCLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
+# On the other hand, it is very hard to specify the exact name of .chksh and
+# .logsh files because some scripts live in the source tree, not the build
+# tree. Thus, we clean all .logsh and .chksh files.
+CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
$(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.chksh) \
- $(TEST_SCRIPT_PARA_CHKSH:.chksh_=.chksh) \
$(TEST_PROG_CHKEXE:.chkexe_=.log) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.logsh)
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \
+ *.chksh *.logsh
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES)
SUBDIRS = src test
# Automake needs to be taught how to build lib, progs, and tests targets.
@@ -636,7 +639,7 @@ build-lib: $(BUILT_SOURCES) $(LIB)
build-progs: $(BUILT_SOURCES) $(LIB) $(PROGS)
build-tests: $(BUILT_SOURCES) $(LIB) $(PROGS) $(TESTS)
-lib progs tests check-s check-p ::
+lib progs tests check-s check-p check-clean ::
@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
@for d in X $(SUBDIRS); do \
if test $$d != X && test $$d != .; then \
@@ -656,6 +659,10 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
install-doc uninstall-doc:
@echo "Nothing to be done."
+# clean up files generated by tests so they can be re-run.
+build-check-clean:
+ $(RM) $(CHECK_CLEANFILES)
+
# Run each test in order, passing $(TEST_FLAGS) to the program.
# Since tests are done in a shell loop, "make -i" does apply inside it.
# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in
index e6b857f..2a20f72 100644
--- a/hl/c++/src/Makefile.in
+++ b/hl/c++/src/Makefile.in
@@ -307,13 +307,16 @@ H5FC_PP = $(bindir)/h5pfc
# Serial tests create .log and .logsh files. It's important only to clean log
# files generated by HDF5's tests, because the .log suffix is used for
# other files (e.g., config.log)!
-MOSTLYCLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
+# On the other hand, it is very hard to specify the exact name of .chksh and
+# .logsh files because some scripts live in the source tree, not the build
+# tree. Thus, we clean all .logsh and .chksh files.
+CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
$(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.chksh) \
- $(TEST_SCRIPT_PARA_CHKSH:.chksh_=.chksh) \
$(TEST_PROG_CHKEXE:.chkexe_=.log) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.logsh)
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \
+ *.chksh *.logsh
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES)
# Include src directory
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/hl/src
@@ -658,7 +661,7 @@ build-lib: $(BUILT_SOURCES) $(LIB)
build-progs: $(BUILT_SOURCES) $(LIB) $(PROGS)
build-tests: $(BUILT_SOURCES) $(LIB) $(PROGS) $(TESTS)
-lib progs tests check-s check-p ::
+lib progs tests check-s check-p check-clean ::
@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
@for d in X $(SUBDIRS); do \
if test $$d != X && test $$d != .; then \
@@ -678,6 +681,10 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
install-doc uninstall-doc:
@echo "Nothing to be done."
+# clean up files generated by tests so they can be re-run.
+build-check-clean:
+ $(RM) $(CHECK_CLEANFILES)
+
# Run each test in order, passing $(TEST_FLAGS) to the program.
# Since tests are done in a shell loop, "make -i" does apply inside it.
# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in
index efce9d9..53d499c 100644
--- a/hl/c++/test/Makefile.in
+++ b/hl/c++/test/Makefile.in
@@ -301,13 +301,16 @@ H5FC_PP = $(bindir)/h5pfc
# Serial tests create .log and .logsh files. It's important only to clean log
# files generated by HDF5's tests, because the .log suffix is used for
# other files (e.g., config.log)!
-MOSTLYCLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
+# On the other hand, it is very hard to specify the exact name of .chksh and
+# .logsh files because some scripts live in the source tree, not the build
+# tree. Thus, we clean all .logsh and .chksh files.
+CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
$(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.chksh) \
- $(TEST_SCRIPT_PARA_CHKSH:.chksh_=.chksh) \
$(TEST_PROG_CHKEXE:.chkexe_=.log) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.logsh)
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \
+ *.chksh *.logsh
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES)
# Include directories
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/hl/src -I$(top_srcdir)/hl/c++/src -I$(top_srcdir)/test
@@ -607,7 +610,7 @@ build-lib: $(BUILT_SOURCES) $(LIB)
build-progs: $(BUILT_SOURCES) $(LIB) $(PROGS)
build-tests: $(BUILT_SOURCES) $(LIB) $(PROGS) $(TESTS)
-lib progs tests check-s check-p ::
+lib progs tests check-s check-p check-clean ::
@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
@for d in X $(SUBDIRS); do \
if test $$d != X && test $$d != .; then \
@@ -627,6 +630,10 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
install-doc uninstall-doc:
@echo "Nothing to be done."
+# clean up files generated by tests so they can be re-run.
+build-check-clean:
+ $(RM) $(CHECK_CLEANFILES)
+
# Run each test in order, passing $(TEST_FLAGS) to the program.
# Since tests are done in a shell loop, "make -i" does apply inside it.
# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in
index f58bf2f..ba8c2ae 100644
--- a/hl/fortran/Makefile.in
+++ b/hl/fortran/Makefile.in
@@ -280,13 +280,16 @@ H5FC_PP = $(bindir)/h5pfc
# Serial tests create .log and .logsh files. It's important only to clean log
# files generated by HDF5's tests, because the .log suffix is used for
# other files (e.g., config.log)!
-MOSTLYCLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
+# On the other hand, it is very hard to specify the exact name of .chksh and
+# .logsh files because some scripts live in the source tree, not the build
+# tree. Thus, we clean all .logsh and .chksh files.
+CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
$(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.chksh) \
- $(TEST_SCRIPT_PARA_CHKSH:.chksh_=.chksh) \
$(TEST_PROG_CHKEXE:.chkexe_=.log) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.logsh)
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \
+ *.chksh *.logsh
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES)
SUBDIRS = src test
# Automake needs to be taught how to build lib, progs, and tests targets.
@@ -631,7 +634,7 @@ build-lib: $(BUILT_SOURCES) $(LIB)
build-progs: $(BUILT_SOURCES) $(LIB) $(PROGS)
build-tests: $(BUILT_SOURCES) $(LIB) $(PROGS) $(TESTS)
-lib progs tests check-s check-p ::
+lib progs tests check-s check-p check-clean ::
@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
@for d in X $(SUBDIRS); do \
if test $$d != X && test $$d != .; then \
@@ -651,6 +654,10 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
install-doc uninstall-doc:
@echo "Nothing to be done."
+# clean up files generated by tests so they can be re-run.
+build-check-clean:
+ $(RM) $(CHECK_CLEANFILES)
+
# Run each test in order, passing $(TEST_FLAGS) to the program.
# Since tests are done in a shell loop, "make -i" does apply inside it.
# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
diff --git a/hl/fortran/src/Makefile.am b/hl/fortran/src/Makefile.am
index 1462fbb..14076e7 100644
--- a/hl/fortran/src/Makefile.am
+++ b/hl/fortran/src/Makefile.am
@@ -29,8 +29,6 @@ lib_LTLIBRARIES=libhdf5hl_fortran.la
libhdf5hl_fortran_la_SOURCES=H5LTfc.c H5IMfc.c H5IMcc.c H5TBfc.c H5LTff.f90 \
H5IMff.f90 H5TBff.f90
-#libhdf5hl_fortran_la_LIBADD=$(LIBH5_HL)
-
# Fortran module files can have different extensions and different names
# (e.g., different capitalizations) on different platforms. Write rules
# for them explicitly rather than trying to teach automake about them.
@@ -38,17 +36,17 @@ libhdf5hl_fortran_la_SOURCES=H5LTfc.c H5IMfc.c H5IMcc.c H5TBfc.c H5LTff.f90 \
maintainer-clean-local: clean-local
distclean-local: clean-local
clean-local:
- if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \
+ @if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \
$(RM) *.$(F9XMODEXT); \
fi
install-data-local:
- if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \
+ @if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \
$(CP) $(top_builddir)/$(subdir)/*.$(F9XMODEXT) $(includedir)/. ; \
fi
uninstall-local:
- if test -n "$(F9XMODEXT)" -a "X$(F9XMODEXT)" != "Xo"; then \
+ @if test -n "$(F9XMODEXT)" -a "X$(F9XMODEXT)" != "Xo"; then \
if test -f "$(includedir)/hdf5.$(F9XMODEXT)" -o -f "$(includedir)/HDF5.$(F9XMODEXT)"; then \
set -x; $(RM) $(includedir)/*.$(F9XMODEXT); \
fi; \
diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in
index e945d4e..409bb03 100644
--- a/hl/fortran/src/Makefile.in
+++ b/hl/fortran/src/Makefile.in
@@ -301,13 +301,16 @@ H5FC_PP = $(bindir)/h5pfc
# Serial tests create .log and .logsh files. It's important only to clean log
# files generated by HDF5's tests, because the .log suffix is used for
# other files (e.g., config.log)!
-MOSTLYCLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
+# On the other hand, it is very hard to specify the exact name of .chksh and
+# .logsh files because some scripts live in the source tree, not the build
+# tree. Thus, we clean all .logsh and .chksh files.
+CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
$(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.chksh) \
- $(TEST_SCRIPT_PARA_CHKSH:.chksh_=.chksh) \
$(TEST_PROG_CHKEXE:.chkexe_=.log) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.logsh)
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \
+ *.chksh *.logsh
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES)
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/hl/src -I$(top_builddir)/hl/src \
-I$(top_srcdir)/fortran/src -I$(top_builddir)/fortran/src
@@ -641,8 +644,6 @@ uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
# as well.
check-install: installcheck
-#libhdf5hl_fortran_la_LIBADD=$(LIBH5_HL)
-
# Fortran module files can have different extensions and different names
# (e.g., different capitalizations) on different platforms. Write rules
# for them explicitly rather than trying to teach automake about them.
@@ -650,17 +651,17 @@ check-install: installcheck
maintainer-clean-local: clean-local
distclean-local: clean-local
clean-local:
- if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \
+ @if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \
$(RM) *.$(F9XMODEXT); \
fi
install-data-local:
- if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \
+ @if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \
$(CP) $(top_builddir)/$(subdir)/*.$(F9XMODEXT) $(includedir)/. ; \
fi
uninstall-local:
- if test -n "$(F9XMODEXT)" -a "X$(F9XMODEXT)" != "Xo"; then \
+ @if test -n "$(F9XMODEXT)" -a "X$(F9XMODEXT)" != "Xo"; then \
if test -f "$(includedir)/hdf5.$(F9XMODEXT)" -o -f "$(includedir)/HDF5.$(F9XMODEXT)"; then \
set -x; $(RM) $(includedir)/*.$(F9XMODEXT); \
fi; \
@@ -682,7 +683,7 @@ build-lib: $(BUILT_SOURCES) $(LIB)
build-progs: $(BUILT_SOURCES) $(LIB) $(PROGS)
build-tests: $(BUILT_SOURCES) $(LIB) $(PROGS) $(TESTS)
-lib progs tests check-s check-p ::
+lib progs tests check-s check-p check-clean ::
@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
@for d in X $(SUBDIRS); do \
if test $$d != X && test $$d != .; then \
@@ -702,6 +703,10 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
install-doc uninstall-doc:
@echo "Nothing to be done."
+# clean up files generated by tests so they can be re-run.
+build-check-clean:
+ $(RM) $(CHECK_CLEANFILES)
+
# Run each test in order, passing $(TEST_FLAGS) to the program.
# Since tests are done in a shell loop, "make -i" does apply inside it.
# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in
index 594253a..891a304 100644
--- a/hl/fortran/test/Makefile.in
+++ b/hl/fortran/test/Makefile.in
@@ -300,15 +300,18 @@ H5FC_PP = $(bindir)/h5pfc
# Serial tests create .log and .logsh files. It's important only to clean log
# files generated by HDF5's tests, because the .log suffix is used for
# other files (e.g., config.log)!
+# On the other hand, it is very hard to specify the exact name of .chksh and
+# .logsh files because some scripts live in the source tree, not the build
+# tree. Thus, we clean all .logsh and .chksh files.
+CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
+ $(TEST_PROG_CHKEXE:.chkexe_=.log) \
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \
+ *.chksh *.logsh
+
# Temporary files.
-MOSTLYCLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.chksh) \
- $(TEST_SCRIPT_PARA_CHKSH:.chksh_=.chksh) \
- $(TEST_PROG_CHKEXE:.chkexe_=.log) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.logsh) dsetf[1-4].h5 f1img.h5 \
- f1tab.h5
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES) dsetf[1-4].h5 f1img.h5 f1tab.h5
AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_srcdir)/hl/src
AM_FCFLAGS = -I$(top_builddir)/fortran/src -I$(top_builddir)/hl/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/hl/fortran/src
@@ -598,7 +601,7 @@ build-lib: $(BUILT_SOURCES) $(LIB)
build-progs: $(BUILT_SOURCES) $(LIB) $(PROGS)
build-tests: $(BUILT_SOURCES) $(LIB) $(PROGS) $(TESTS)
-lib progs tests check-s check-p ::
+lib progs tests check-s check-p check-clean ::
@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
@for d in X $(SUBDIRS); do \
if test $$d != X && test $$d != .; then \
@@ -618,6 +621,10 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
install-doc uninstall-doc:
@echo "Nothing to be done."
+# clean up files generated by tests so they can be re-run.
+build-check-clean:
+ $(RM) $(CHECK_CLEANFILES)
+
# Run each test in order, passing $(TEST_FLAGS) to the program.
# Since tests are done in a shell loop, "make -i" does apply inside it.
# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in
index 56a47b8..c4f5777 100644
--- a/hl/src/Makefile.in
+++ b/hl/src/Makefile.in
@@ -298,13 +298,16 @@ H5FC_PP = $(bindir)/h5pfc
# Serial tests create .log and .logsh files. It's important only to clean log
# files generated by HDF5's tests, because the .log suffix is used for
# other files (e.g., config.log)!
-MOSTLYCLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
+# On the other hand, it is very hard to specify the exact name of .chksh and
+# .logsh files because some scripts live in the source tree, not the build
+# tree. Thus, we clean all .logsh and .chksh files.
+CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
$(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.chksh) \
- $(TEST_SCRIPT_PARA_CHKSH:.chksh_=.chksh) \
$(TEST_PROG_CHKEXE:.chkexe_=.log) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.logsh)
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \
+ *.chksh *.logsh
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES)
# Add include directories to the C preprocessor flags
AM_CPPFLAGS = -I$(top_srcdir)/src
@@ -646,7 +649,7 @@ build-lib: $(BUILT_SOURCES) $(LIB)
build-progs: $(BUILT_SOURCES) $(LIB) $(PROGS)
build-tests: $(BUILT_SOURCES) $(LIB) $(PROGS) $(TESTS)
-lib progs tests check-s check-p ::
+lib progs tests check-s check-p check-clean ::
@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
@for d in X $(SUBDIRS); do \
if test $$d != X && test $$d != .; then \
@@ -666,6 +669,10 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
install-doc uninstall-doc:
@echo "Nothing to be done."
+# clean up files generated by tests so they can be re-run.
+build-check-clean:
+ $(RM) $(CHECK_CLEANFILES)
+
# Run each test in order, passing $(TEST_FLAGS) to the program.
# Since tests are done in a shell loop, "make -i" does apply inside it.
# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in
index 0e9ee01..c648788 100644
--- a/hl/test/Makefile.in
+++ b/hl/test/Makefile.in
@@ -310,14 +310,18 @@ H5FC_PP = $(bindir)/h5pfc
# Serial tests create .log and .logsh files. It's important only to clean log
# files generated by HDF5's tests, because the .log suffix is used for
# other files (e.g., config.log)!
+# On the other hand, it is very hard to specify the exact name of .chksh and
+# .logsh files because some scripts live in the source tree, not the build
+# tree. Thus, we clean all .logsh and .chksh files.
+CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
+ $(TEST_PROG_CHKEXE:.chkexe_=.log) \
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \
+ *.chksh *.logsh
+
# Temporary files. These files are the ones created by running `make test'.
-MOSTLYCLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.chksh) \
- $(TEST_SCRIPT_PARA_CHKSH:.chksh_=.chksh) \
- $(TEST_PROG_CHKEXE:.chkexe_=.log) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.logsh) combine_tables[1-2].h5 \
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES) combine_tables[1-2].h5 \
test_ds[1-6].h5 test_image[1-3].h5 test_lite[1-2].h5 \
test_table.h5 test_packet_table.h5
@@ -631,7 +635,7 @@ build-lib: $(BUILT_SOURCES) $(LIB)
build-progs: $(BUILT_SOURCES) $(LIB) $(PROGS)
build-tests: $(BUILT_SOURCES) $(LIB) $(PROGS) $(TESTS)
-lib progs tests check-s check-p ::
+lib progs tests check-s check-p check-clean ::
@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
@for d in X $(SUBDIRS); do \
if test $$d != X && test $$d != .; then \
@@ -651,6 +655,10 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
install-doc uninstall-doc:
@echo "Nothing to be done."
+# clean up files generated by tests so they can be re-run.
+build-check-clean:
+ $(RM) $(CHECK_CLEANFILES)
+
# Run each test in order, passing $(TEST_FLAGS) to the program.
# Since tests are done in a shell loop, "make -i" does apply inside it.
# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in
index b5b639d..b8c389a 100644
--- a/hl/tools/gif2h5/Makefile.in
+++ b/hl/tools/gif2h5/Makefile.in
@@ -308,13 +308,16 @@ H5FC_PP = $(bindir)/h5pfc
# Serial tests create .log and .logsh files. It's important only to clean log
# files generated by HDF5's tests, because the .log suffix is used for
# other files (e.g., config.log)!
-MOSTLYCLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
+# On the other hand, it is very hard to specify the exact name of .chksh and
+# .logsh files because some scripts live in the source tree, not the build
+# tree. Thus, we clean all .logsh and .chksh files.
+CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
$(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.chksh) \
- $(TEST_SCRIPT_PARA_CHKSH:.chksh_=.chksh) \
$(TEST_PROG_CHKEXE:.chkexe_=.log) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.logsh)
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \
+ *.chksh *.logsh
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES)
# Include src and tools/lib directories
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
@@ -641,7 +644,7 @@ build-lib: $(BUILT_SOURCES) $(LIB)
build-progs: $(BUILT_SOURCES) $(LIB) $(PROGS)
build-tests: $(BUILT_SOURCES) $(LIB) $(PROGS) $(TESTS)
-lib progs tests check-s check-p ::
+lib progs tests check-s check-p check-clean ::
@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
@for d in X $(SUBDIRS); do \
if test $$d != X && test $$d != .; then \
@@ -661,6 +664,10 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
install-doc uninstall-doc:
@echo "Nothing to be done."
+# clean up files generated by tests so they can be re-run.
+build-check-clean:
+ $(RM) $(CHECK_CLEANFILES)
+
# Run each test in order, passing $(TEST_FLAGS) to the program.
# Since tests are done in a shell loop, "make -i" does apply inside it.
# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
diff --git a/perform/Makefile.in b/perform/Makefile.in
index b05499f..5c1bca9 100644
--- a/perform/Makefile.in
+++ b/perform/Makefile.in
@@ -329,13 +329,16 @@ H5FC_PP = $(bindir)/h5pfc
# Serial tests create .log and .logsh files. It's important only to clean log
# files generated by HDF5's tests, because the .log suffix is used for
# other files (e.g., config.log)!
-MOSTLYCLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
+# On the other hand, it is very hard to specify the exact name of .chksh and
+# .logsh files because some scripts live in the source tree, not the build
+# tree. Thus, we clean all .logsh and .chksh files.
+CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
$(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.chksh) \
- $(TEST_SCRIPT_PARA_CHKSH:.chksh_=.chksh) \
$(TEST_PROG_CHKEXE:.chkexe_=.log) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.logsh)
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \
+ *.chksh *.logsh
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES)
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/tools/lib
@BUILD_PARALLEL_CONDITIONAL_TRUE@TEST_PROG_PARA = h5perf
@@ -700,7 +703,7 @@ build-lib: $(BUILT_SOURCES) $(LIB)
build-progs: $(BUILT_SOURCES) $(LIB) $(PROGS)
build-tests: $(BUILT_SOURCES) $(LIB) $(PROGS) $(TESTS)
-lib progs tests check-s check-p ::
+lib progs tests check-s check-p check-clean ::
@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
@for d in X $(SUBDIRS); do \
if test $$d != X && test $$d != .; then \
@@ -720,6 +723,10 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
install-doc uninstall-doc:
@echo "Nothing to be done."
+# clean up files generated by tests so they can be re-run.
+build-check-clean:
+ $(RM) $(CHECK_CLEANFILES)
+
# Run each test in order, passing $(TEST_FLAGS) to the program.
# Since tests are done in a shell loop, "make -i" does apply inside it.
# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
diff --git a/src/Makefile.in b/src/Makefile.in
index 81097b0..40ebd40 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -343,15 +343,19 @@ H5FC_PP = $(bindir)/h5pfc
# Serial tests create .log and .logsh files. It's important only to clean log
# files generated by HDF5's tests, because the .log suffix is used for
# other files (e.g., config.log)!
+# On the other hand, it is very hard to specify the exact name of .chksh and
+# .logsh files because some scripts live in the source tree, not the build
+# tree. Thus, we clean all .logsh and .chksh files.
+CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
+ $(TEST_PROG_CHKEXE:.chkexe_=.log) \
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \
+ *.chksh *.logsh
+
# Temporary files
-MOSTLYCLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.chksh) \
- $(TEST_SCRIPT_PARA_CHKSH:.chksh_=.chksh) \
- $(TEST_PROG_CHKEXE:.chkexe_=.log) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.logsh) H5detect.o H5detect.lo \
- H5detect H5Tinit.o H5Tinit.lo H5Tinit.c
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES) H5detect.o H5detect.lo H5detect \
+ H5Tinit.o H5Tinit.lo H5Tinit.c
# Add libtool shared library version numbers to the HDF5 library
# See libtool versioning documentation online.
@@ -957,7 +961,7 @@ build-lib: $(BUILT_SOURCES) $(LIB)
build-progs: $(BUILT_SOURCES) $(LIB) $(PROGS)
build-tests: $(BUILT_SOURCES) $(LIB) $(PROGS) $(TESTS)
-lib progs tests check-s check-p ::
+lib progs tests check-s check-p check-clean ::
@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
@for d in X $(SUBDIRS); do \
if test $$d != X && test $$d != .; then \
@@ -977,6 +981,10 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
install-doc uninstall-doc:
@echo "Nothing to be done."
+# clean up files generated by tests so they can be re-run.
+build-check-clean:
+ $(RM) $(CHECK_CLEANFILES)
+
# Run each test in order, passing $(TEST_FLAGS) to the program.
# Since tests are done in a shell loop, "make -i" does apply inside it.
# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
diff --git a/test/Makefile.in b/test/Makefile.in
index df37afe..f16f627 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -496,28 +496,31 @@ H5FC_PP = $(bindir)/h5pfc
# Serial tests create .log and .logsh files. It's important only to clean log
# files generated by HDF5's tests, because the .log suffix is used for
# other files (e.g., config.log)!
+# On the other hand, it is very hard to specify the exact name of .chksh and
+# .logsh files because some scripts live in the source tree, not the build
+# tree. Thus, we clean all .logsh and .chksh files.
+CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
+ $(TEST_PROG_CHKEXE:.chkexe_=.log) \
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \
+ *.chksh *.logsh
+
# Temporary files. These files are the ones created by setting the
# HDF5_NOCLEANUP environment variable and running `make test' without
# specifying a file prefix or low-level driver. Changing the file
# prefix or low-level driver with environment variables will influence
# the temporary file name in ways that the makefile is not aware of.
-MOSTLYCLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.chksh) \
- $(TEST_SCRIPT_PARA_CHKSH:.chksh_=.chksh) \
- $(TEST_PROG_CHKEXE:.chkexe_=.log) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.logsh) cmpd_dset.h5 \
- compact_dataset.h5 dataset.h5 extend.h5 istore.h5 \
- tfile[1-4].h5 th5s[1-3].h5 lheap.h5 ohdr.h5 stab[1-2].h5 \
- extern_[1-3].h5 extern_[1-4][ab].raw gheap[0-4].h5 \
- dt_arith[1-2] links.h5 links[1-3].h5 big.data \
- big[0-9][0-9][0-9][0-9][0-9].h5 dtypes[1-8].h5 \
- dt_arith[1-2].h5 tattr.h5 tselect.h5 mtime.h5 unlink.h5 \
- unicode.h5 fillval_[0-9].h5 fillval.raw mount_[0-9].h5 \
- testmeta.h5 ttime.h5 trefer[1-3].h5 tvltypes.h5 tvlstr.h5 \
- tvlstr2.h5 flush.h5 enum1.h5 titerate.h5 ttsafe.h5 tarray1.h5 \
- tgenprop.h5 tmisc[0-9]*.h5 set_extent_read.h5 \
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES) cmpd_dset.h5 compact_dataset.h5 \
+ dataset.h5 extend.h5 istore.h5 tfile[1-4].h5 th5s[1-3].h5 \
+ lheap.h5 ohdr.h5 stab[1-2].h5 extern_[1-3].h5 \
+ extern_[1-4][ab].raw gheap[0-4].h5 dt_arith[1-2] links.h5 \
+ links[1-3].h5 big.data big[0-9][0-9][0-9][0-9][0-9].h5 \
+ dtypes[1-8].h5 dt_arith[1-2].h5 tattr.h5 tselect.h5 mtime.h5 \
+ unlink.h5 unicode.h5 fillval_[0-9].h5 fillval.raw \
+ mount_[0-9].h5 testmeta.h5 ttime.h5 trefer[1-3].h5 tvltypes.h5 \
+ tvlstr.h5 tvlstr2.h5 flush.h5 enum1.h5 titerate.h5 ttsafe.h5 \
+ tarray1.h5 tgenprop.h5 tmisc[0-9]*.h5 set_extent_read.h5 \
set_extent_create.h5 getname.h5 getname[1-3].h5 sec2_file.h5 \
family_file000[0-3][0-9].h5 multi_file-[rs].h5 core_file \
new_move_[ab].h5 ntypes.h5 dangle.h5 error_test.h5 \
@@ -1060,7 +1063,7 @@ build-lib: $(BUILT_SOURCES) $(LIB)
build-progs: $(BUILT_SOURCES) $(LIB) $(PROGS)
build-tests: $(BUILT_SOURCES) $(LIB) $(PROGS) $(TESTS)
-lib progs tests check-s check-p ::
+lib progs tests check-s check-p check-clean ::
@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
@for d in X $(SUBDIRS); do \
if test $$d != X && test $$d != .; then \
@@ -1080,6 +1083,10 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
install-doc uninstall-doc:
@echo "Nothing to be done."
+# clean up files generated by tests so they can be re-run.
+build-check-clean:
+ $(RM) $(CHECK_CLEANFILES)
+
# Run each test in order, passing $(TEST_FLAGS) to the program.
# Since tests are done in a shell loop, "make -i" does apply inside it.
# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
diff --git a/testpar/Makefile.in b/testpar/Makefile.in
index 147a05f..9940bfe 100644
--- a/testpar/Makefile.in
+++ b/testpar/Makefile.in
@@ -309,17 +309,21 @@ H5FC_PP = $(bindir)/h5pfc
# Serial tests create .log and .logsh files. It's important only to clean log
# files generated by HDF5's tests, because the .log suffix is used for
# other files (e.g., config.log)!
+# On the other hand, it is very hard to specify the exact name of .chksh and
+# .logsh files because some scripts live in the source tree, not the build
+# tree. Thus, we clean all .logsh and .chksh files.
+CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
+ $(TEST_PROG_CHKEXE:.chkexe_=.log) \
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \
+ *.chksh *.logsh
+
# Temporary files
# MPItest.h5 is from t_mpi
# Para*.h5 are from testphdf
# *.clog are from MPE option
-MOSTLYCLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.chksh) \
- $(TEST_SCRIPT_PARA_CHKSH:.chksh_=.chksh) \
- $(TEST_PROG_CHKEXE:.chkexe_=.log) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.logsh) MPItest.h5 Para*.h5 *.clog
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES) MPItest.h5 Para*.h5 *.clog
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/test
# Test programs and scripts. These are our main targets.
@@ -636,7 +640,7 @@ build-lib: $(BUILT_SOURCES) $(LIB)
build-progs: $(BUILT_SOURCES) $(LIB) $(PROGS)
build-tests: $(BUILT_SOURCES) $(LIB) $(PROGS) $(TESTS)
-lib progs tests check-s check-p ::
+lib progs tests check-s check-p check-clean ::
@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
@for d in X $(SUBDIRS); do \
if test $$d != X && test $$d != .; then \
@@ -656,6 +660,10 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
install-doc uninstall-doc:
@echo "Nothing to be done."
+# clean up files generated by tests so they can be re-run.
+build-check-clean:
+ $(RM) $(CHECK_CLEANFILES)
+
# Run each test in order, passing $(TEST_FLAGS) to the program.
# Since tests are done in a shell loop, "make -i" does apply inside it.
# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 4d5182e..b7f255b 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -285,13 +285,16 @@ H5FC_PP = $(bindir)/h5pfc
# Serial tests create .log and .logsh files. It's important only to clean log
# files generated by HDF5's tests, because the .log suffix is used for
# other files (e.g., config.log)!
-MOSTLYCLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
+# On the other hand, it is very hard to specify the exact name of .chksh and
+# .logsh files because some scripts live in the source tree, not the build
+# tree. Thus, we clean all .logsh and .chksh files.
+CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
$(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.chksh) \
- $(TEST_SCRIPT_PARA_CHKSH:.chksh_=.chksh) \
$(TEST_PROG_CHKEXE:.chkexe_=.log) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.logsh)
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \
+ *.chksh *.logsh
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES)
# All subdirectories
SUBDIRS = lib h5dump h5diff h5ls misc gifconv h5import h5repack h5jam
@@ -638,7 +641,7 @@ build-lib: $(BUILT_SOURCES) $(LIB)
build-progs: $(BUILT_SOURCES) $(LIB) $(PROGS)
build-tests: $(BUILT_SOURCES) $(LIB) $(PROGS) $(TESTS)
-lib progs tests check-s check-p ::
+lib progs tests check-s check-p check-clean ::
@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
@for d in X $(SUBDIRS); do \
if test $$d != X && test $$d != .; then \
@@ -658,6 +661,10 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
install-doc uninstall-doc:
@echo "Nothing to be done."
+# clean up files generated by tests so they can be re-run.
+build-check-clean:
+ $(RM) $(CHECK_CLEANFILES)
+
# Run each test in order, passing $(TEST_FLAGS) to the program.
# Since tests are done in a shell loop, "make -i" does apply inside it.
# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
diff --git a/tools/gifconv/Makefile.in b/tools/gifconv/Makefile.in
index b5b639d..b8c389a 100644
--- a/tools/gifconv/Makefile.in
+++ b/tools/gifconv/Makefile.in
@@ -308,13 +308,16 @@ H5FC_PP = $(bindir)/h5pfc
# Serial tests create .log and .logsh files. It's important only to clean log
# files generated by HDF5's tests, because the .log suffix is used for
# other files (e.g., config.log)!
-MOSTLYCLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
+# On the other hand, it is very hard to specify the exact name of .chksh and
+# .logsh files because some scripts live in the source tree, not the build
+# tree. Thus, we clean all .logsh and .chksh files.
+CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
$(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.chksh) \
- $(TEST_SCRIPT_PARA_CHKSH:.chksh_=.chksh) \
$(TEST_PROG_CHKEXE:.chkexe_=.log) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.logsh)
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \
+ *.chksh *.logsh
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES)
# Include src and tools/lib directories
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
@@ -641,7 +644,7 @@ build-lib: $(BUILT_SOURCES) $(LIB)
build-progs: $(BUILT_SOURCES) $(LIB) $(PROGS)
build-tests: $(BUILT_SOURCES) $(LIB) $(PROGS) $(TESTS)
-lib progs tests check-s check-p ::
+lib progs tests check-s check-p check-clean ::
@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
@for d in X $(SUBDIRS); do \
if test $$d != X && test $$d != .; then \
@@ -661,6 +664,10 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
install-doc uninstall-doc:
@echo "Nothing to be done."
+# clean up files generated by tests so they can be re-run.
+build-check-clean:
+ $(RM) $(CHECK_CLEANFILES)
+
# Run each test in order, passing $(TEST_FLAGS) to the program.
# Since tests are done in a shell loop, "make -i" does apply inside it.
# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in
index b5e7c41..10bb0eb 100644
--- a/tools/h5diff/Makefile.in
+++ b/tools/h5diff/Makefile.in
@@ -316,15 +316,19 @@ H5FC_PP = $(bindir)/h5pfc
# Serial tests create .log and .logsh files. It's important only to clean log
# files generated by HDF5's tests, because the .log suffix is used for
# other files (e.g., config.log)!
+# On the other hand, it is very hard to specify the exact name of .chksh and
+# .logsh files because some scripts live in the source tree, not the build
+# tree. Thus, we clean all .logsh and .chksh files.
+CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
+ $(TEST_PROG_CHKEXE:.chkexe_=.log) \
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \
+ *.chksh *.logsh
+
# Temporary files. *.h5 are generated by h5diff. They should
# be copied to the testfiles/ directory if update is required
-MOSTLYCLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.chksh) \
- $(TEST_SCRIPT_PARA_CHKSH:.chksh_=.chksh) \
- $(TEST_PROG_CHKEXE:.chkexe_=.log) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.logsh) *.h5 expect_sorted \
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES) *.h5 expect_sorted \
actual_sorted
# Include src and tools/lib directories
@@ -679,7 +683,7 @@ build-lib: $(BUILT_SOURCES) $(LIB)
build-progs: $(BUILT_SOURCES) $(LIB) $(PROGS)
build-tests: $(BUILT_SOURCES) $(LIB) $(PROGS) $(TESTS)
-lib progs tests check-s check-p ::
+lib progs tests check-s check-p check-clean ::
@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
@for d in X $(SUBDIRS); do \
if test $$d != X && test $$d != .; then \
@@ -699,6 +703,10 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
install-doc uninstall-doc:
@echo "Nothing to be done."
+# clean up files generated by tests so they can be re-run.
+build-check-clean:
+ $(RM) $(CHECK_CLEANFILES)
+
# Run each test in order, passing $(TEST_FLAGS) to the program.
# Since tests are done in a shell loop, "make -i" does apply inside it.
# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in
index f8d1b96..5f129c2 100644
--- a/tools/h5dump/Makefile.in
+++ b/tools/h5dump/Makefile.in
@@ -309,15 +309,19 @@ H5FC_PP = $(bindir)/h5pfc
# Serial tests create .log and .logsh files. It's important only to clean log
# files generated by HDF5's tests, because the .log suffix is used for
# other files (e.g., config.log)!
+# On the other hand, it is very hard to specify the exact name of .chksh and
+# .logsh files because some scripts live in the source tree, not the build
+# tree. Thus, we clean all .logsh and .chksh files.
+CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
+ $(TEST_PROG_CHKEXE:.chkexe_=.log) \
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \
+ *.chksh *.logsh
+
# Temporary files. *.h5 are generated by h5dumpgentest. They should
# copied to the testfiles/ directory if update is required.
-MOSTLYCLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.chksh) \
- $(TEST_SCRIPT_PARA_CHKSH:.chksh_=.chksh) \
- $(TEST_PROG_CHKEXE:.chkexe_=.log) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.logsh) *.h5
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES) *.h5
# Include files in /src directory and /tools/lib directory
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
@@ -654,7 +658,7 @@ build-lib: $(BUILT_SOURCES) $(LIB)
build-progs: $(BUILT_SOURCES) $(LIB) $(PROGS)
build-tests: $(BUILT_SOURCES) $(LIB) $(PROGS) $(TESTS)
-lib progs tests check-s check-p ::
+lib progs tests check-s check-p check-clean ::
@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
@for d in X $(SUBDIRS); do \
if test $$d != X && test $$d != .; then \
@@ -674,6 +678,10 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
install-doc uninstall-doc:
@echo "Nothing to be done."
+# clean up files generated by tests so they can be re-run.
+build-check-clean:
+ $(RM) $(CHECK_CLEANFILES)
+
# Run each test in order, passing $(TEST_FLAGS) to the program.
# Since tests are done in a shell loop, "make -i" does apply inside it.
# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in
index 4f1a039..062e65d 100755
--- a/tools/h5import/Makefile.in
+++ b/tools/h5import/Makefile.in
@@ -309,13 +309,16 @@ H5FC_PP = $(bindir)/h5pfc
# Serial tests create .log and .logsh files. It's important only to clean log
# files generated by HDF5's tests, because the .log suffix is used for
# other files (e.g., config.log)!
-MOSTLYCLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
+# On the other hand, it is very hard to specify the exact name of .chksh and
+# .logsh files because some scripts live in the source tree, not the build
+# tree. Thus, we clean all .logsh and .chksh files.
+CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
$(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.chksh) \
- $(TEST_SCRIPT_PARA_CHKSH:.chksh_=.chksh) \
$(TEST_PROG_CHKEXE:.chkexe_=.log) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.logsh)
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \
+ *.chksh *.logsh
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES)
# Include src and tools/lib directories
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
@@ -648,7 +651,7 @@ build-lib: $(BUILT_SOURCES) $(LIB)
build-progs: $(BUILT_SOURCES) $(LIB) $(PROGS)
build-tests: $(BUILT_SOURCES) $(LIB) $(PROGS) $(TESTS)
-lib progs tests check-s check-p ::
+lib progs tests check-s check-p check-clean ::
@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
@for d in X $(SUBDIRS); do \
if test $$d != X && test $$d != .; then \
@@ -668,6 +671,10 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
install-doc uninstall-doc:
@echo "Nothing to be done."
+# clean up files generated by tests so they can be re-run.
+build-check-clean:
+ $(RM) $(CHECK_CLEANFILES)
+
# Run each test in order, passing $(TEST_FLAGS) to the program.
# Since tests are done in a shell loop, "make -i" does apply inside it.
# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in
index 6d0c4a7..ac870ae 100644
--- a/tools/h5jam/Makefile.in
+++ b/tools/h5jam/Makefile.in
@@ -304,12 +304,16 @@ H5FC_PP = $(bindir)/h5pfc
# Serial tests create .log and .logsh files. It's important only to clean log
# files generated by HDF5's tests, because the .log suffix is used for
# other files (e.g., config.log)!
-MOSTLYCLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.chksh) \
- $(TEST_SCRIPT_PARA_CHKSH:.chksh_=.chksh) \
- $(TEST_PROG_CHKEXE:.chkexe_=.log) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.logsh) *.h5 *.txt
+# On the other hand, it is very hard to specify the exact name of .chksh and
+# .logsh files because some scripts live in the source tree, not the build
+# tree. Thus, we clean all .logsh and .chksh files.
+CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
+ $(TEST_PROG_CHKEXE:.chkexe_=.log) \
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \
+ *.chksh *.logsh
+
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES) *.h5 *.txt
#
# Copyright by the Board of Trustees of the University of Illinois.
@@ -671,7 +675,7 @@ build-lib: $(BUILT_SOURCES) $(LIB)
build-progs: $(BUILT_SOURCES) $(LIB) $(PROGS)
build-tests: $(BUILT_SOURCES) $(LIB) $(PROGS) $(TESTS)
-lib progs tests check-s check-p ::
+lib progs tests check-s check-p check-clean ::
@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
@for d in X $(SUBDIRS); do \
if test $$d != X && test $$d != .; then \
@@ -691,6 +695,10 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
install-doc uninstall-doc:
@echo "Nothing to be done."
+# clean up files generated by tests so they can be re-run.
+build-check-clean:
+ $(RM) $(CHECK_CLEANFILES)
+
# Run each test in order, passing $(TEST_FLAGS) to the program.
# Since tests are done in a shell loop, "make -i" does apply inside it.
# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in
index 37187e3..65fe002 100644
--- a/tools/h5ls/Makefile.in
+++ b/tools/h5ls/Makefile.in
@@ -302,13 +302,16 @@ H5FC_PP = $(bindir)/h5pfc
# Serial tests create .log and .logsh files. It's important only to clean log
# files generated by HDF5's tests, because the .log suffix is used for
# other files (e.g., config.log)!
-MOSTLYCLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
+# On the other hand, it is very hard to specify the exact name of .chksh and
+# .logsh files because some scripts live in the source tree, not the build
+# tree. Thus, we clean all .logsh and .chksh files.
+CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
$(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.chksh) \
- $(TEST_SCRIPT_PARA_CHKSH:.chksh_=.chksh) \
$(TEST_PROG_CHKEXE:.chkexe_=.log) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.logsh)
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \
+ *.chksh *.logsh
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES)
# Include src and tools/lib directories
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib
@@ -628,7 +631,7 @@ build-lib: $(BUILT_SOURCES) $(LIB)
build-progs: $(BUILT_SOURCES) $(LIB) $(PROGS)
build-tests: $(BUILT_SOURCES) $(LIB) $(PROGS) $(TESTS)
-lib progs tests check-s check-p ::
+lib progs tests check-s check-p check-clean ::
@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
@for d in X $(SUBDIRS); do \
if test $$d != X && test $$d != .; then \
@@ -648,6 +651,10 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
install-doc uninstall-doc:
@echo "Nothing to be done."
+# clean up files generated by tests so they can be re-run.
+build-check-clean:
+ $(RM) $(CHECK_CLEANFILES)
+
# Run each test in order, passing $(TEST_FLAGS) to the program.
# Since tests are done in a shell loop, "make -i" does apply inside it.
# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in
index cc8452c..cc1fbbc 100644
--- a/tools/h5repack/Makefile.in
+++ b/tools/h5repack/Makefile.in
@@ -324,15 +324,19 @@ H5FC_PP = $(bindir)/h5pfc
# Serial tests create .log and .logsh files. It's important only to clean log
# files generated by HDF5's tests, because the .log suffix is used for
# other files (e.g., config.log)!
+# On the other hand, it is very hard to specify the exact name of .chksh and
+# .logsh files because some scripts live in the source tree, not the build
+# tree. Thus, we clean all .logsh and .chksh files.
+CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
+ $(TEST_PROG_CHKEXE:.chkexe_=.log) \
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \
+ *.chksh *.logsh
+
# Temporary files. *.h5 are generated by h5repack. They should
# copied to the testfiles/ directory if update is required.
-MOSTLYCLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.chksh) \
- $(TEST_SCRIPT_PARA_CHKSH:.chksh_=.chksh) \
- $(TEST_PROG_CHKEXE:.chkexe_=.log) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.logsh) *.h5
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES) *.h5
# Include src, test, and tools/lib directories
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/tools/lib
@@ -704,7 +708,7 @@ build-lib: $(BUILT_SOURCES) $(LIB)
build-progs: $(BUILT_SOURCES) $(LIB) $(PROGS)
build-tests: $(BUILT_SOURCES) $(LIB) $(PROGS) $(TESTS)
-lib progs tests check-s check-p ::
+lib progs tests check-s check-p check-clean ::
@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
@for d in X $(SUBDIRS); do \
if test $$d != X && test $$d != .; then \
@@ -724,6 +728,10 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
install-doc uninstall-doc:
@echo "Nothing to be done."
+# clean up files generated by tests so they can be re-run.
+build-check-clean:
+ $(RM) $(CHECK_CLEANFILES)
+
# Run each test in order, passing $(TEST_FLAGS) to the program.
# Since tests are done in a shell loop, "make -i" does apply inside it.
# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in
index 8509c3d..b628570 100644
--- a/tools/lib/Makefile.in
+++ b/tools/lib/Makefile.in
@@ -306,13 +306,16 @@ H5FC_PP = $(bindir)/h5pfc
# Serial tests create .log and .logsh files. It's important only to clean log
# files generated by HDF5's tests, because the .log suffix is used for
# other files (e.g., config.log)!
-MOSTLYCLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
+# On the other hand, it is very hard to specify the exact name of .chksh and
+# .logsh files because some scripts live in the source tree, not the build
+# tree. Thus, we clean all .logsh and .chksh files.
+CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
$(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.chksh) \
- $(TEST_SCRIPT_PARA_CHKSH:.chksh_=.chksh) \
$(TEST_PROG_CHKEXE:.chkexe_=.log) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.logsh)
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \
+ *.chksh *.logsh
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES)
# Include files in /src directory
INCLUDES = -I$(top_srcdir)/src
@@ -645,7 +648,7 @@ build-lib: $(BUILT_SOURCES) $(LIB)
build-progs: $(BUILT_SOURCES) $(LIB) $(PROGS)
build-tests: $(BUILT_SOURCES) $(LIB) $(PROGS) $(TESTS)
-lib progs tests check-s check-p ::
+lib progs tests check-s check-p check-clean ::
@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
@for d in X $(SUBDIRS); do \
if test $$d != X && test $$d != .; then \
@@ -665,6 +668,10 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
install-doc uninstall-doc:
@echo "Nothing to be done."
+# clean up files generated by tests so they can be re-run.
+build-check-clean:
+ $(RM) $(CHECK_CLEANFILES)
+
# Run each test in order, passing $(TEST_FLAGS) to the program.
# Since tests are done in a shell loop, "make -i" does apply inside it.
# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.
diff --git a/tools/misc/Makefile.am b/tools/misc/Makefile.am
index 3e2e173..daf2323 100644
--- a/tools/misc/Makefile.am
+++ b/tools/misc/Makefile.am
@@ -61,12 +61,12 @@ else
endif
install-exec-local:
- $(INSTALL) h5cc $(bindir)/$(H5CC_NAME)
+ @$(INSTALL) h5cc $(bindir)/$(H5CC_NAME)
uninstall-local:
- $(RM) $(bindir)/$(H5CC_NAME)
+ @$(RM) $(bindir)/$(H5CC_NAME)
# How to build h5redeploy script
h5redeploy: h5redeploy.in
- cp $(srcdir)/$@.in $@
+ @cp $(srcdir)/$@.in $@
include $(top_srcdir)/config/conclude.am
diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in
index 0f0eded..8ff5389 100644
--- a/tools/misc/Makefile.in
+++ b/tools/misc/Makefile.in
@@ -329,16 +329,20 @@ H5FC_PP = $(bindir)/h5pfc
# Serial tests create .log and .logsh files. It's important only to clean log
# files generated by HDF5's tests, because the .log suffix is used for
# other files (e.g., config.log)!
+# On the other hand, it is very hard to specify the exact name of .chksh and
+# .logsh files because some scripts live in the source tree, not the build
+# tree. Thus, we clean all .logsh and .chksh files.
+CHECK_CLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
+ $(TEST_PROG_CHKEXE:.chkexe_=.log) \
+ $(TEST_PROG_PARA_CHKEXE:.chkexe_=.log) \
+ *.chksh *.logsh
+
# Temporary files. *.h5 are generated by h5repart_gentest. They should
# copied to the testfiles/ directory if update is required. fst_family*.h5
# and scd_family*.h5 were created by setting the HDF5_NOCLEANUP variable.
-MOSTLYCLEANFILES = $(TEST_PROG_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_PROG_PARA_CHKEXE:.chkexe_=.chkexe) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.chksh) \
- $(TEST_SCRIPT_PARA_CHKSH:.chksh_=.chksh) \
- $(TEST_PROG_CHKEXE:.chkexe_=.log) \
- $(TEST_SCRIPT_CHKSH:.chksh_=.logsh) *.h5 \
+MOSTLYCLEANFILES = $(CHECK_CLEANFILES) *.h5 \
../testfiles/fst_family*.h5 ../testfiles/scd_family*.h5
# Include src directory
@@ -721,13 +725,13 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
check-install: installcheck
install-exec-local:
- $(INSTALL) h5cc $(bindir)/$(H5CC_NAME)
+ @$(INSTALL) h5cc $(bindir)/$(H5CC_NAME)
uninstall-local:
- $(RM) $(bindir)/$(H5CC_NAME)
+ @$(RM) $(bindir)/$(H5CC_NAME)
# How to build h5redeploy script
h5redeploy: h5redeploy.in
- cp $(srcdir)/$@.in $@
+ @cp $(srcdir)/$@.in $@
# lib/progs/tests targets recurse into subdirectories. build-* targets
# build files in this directory.
@@ -737,7 +741,7 @@ build-lib: $(BUILT_SOURCES) $(LIB)
build-progs: $(BUILT_SOURCES) $(LIB) $(PROGS)
build-tests: $(BUILT_SOURCES) $(LIB) $(PROGS) $(TESTS)
-lib progs tests check-s check-p ::
+lib progs tests check-s check-p check-clean ::
@$(MAKE) $(AM_MAKEFLAGS) build-$@ || exit 1;
@for d in X $(SUBDIRS); do \
if test $$d != X && test $$d != .; then \
@@ -757,6 +761,10 @@ all-local: $(EXTRA_LIB) $(EXTRA_PROG) $(TESTS)
install-doc uninstall-doc:
@echo "Nothing to be done."
+# clean up files generated by tests so they can be re-run.
+build-check-clean:
+ $(RM) $(CHECK_CLEANFILES)
+
# Run each test in order, passing $(TEST_FLAGS) to the program.
# Since tests are done in a shell loop, "make -i" does apply inside it.
# Set HDF5_Make_Ignore to a non-blank string to ignore errors inside the loop.