diff options
| author | James Laird <jlaird@hdfgroup.org> | 2005-08-01 22:22:55 (GMT) |
|---|---|---|
| committer | James Laird <jlaird@hdfgroup.org> | 2005-08-01 22:22:55 (GMT) |
| commit | c63ef2cba28df827eb090a019284c7cd8c2982af (patch) | |
| tree | 134ff7254d8ee7b1c6f7fa3eabc509528899d68d /fortran/test | |
| parent | f2240792704b74fc288b4e4a570509c4afe4a34e (diff) | |
| download | hdf5-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:
Diffstat (limited to 'fortran/test')
| -rw-r--r-- | fortran/test/Makefile.am | 7 | ||||
| -rw-r--r-- | fortran/test/Makefile.in | 22 |
2 files changed, 15 insertions, 14 deletions
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. |