diff options
Diffstat (limited to 'fortran/testpar')
| -rw-r--r-- | fortran/testpar/Makefile.am | 6 | ||||
| -rw-r--r-- | fortran/testpar/Makefile.in | 23 |
2 files changed, 12 insertions, 17 deletions
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: |