summaryrefslogtreecommitdiffstats
path: root/hl/fortran
diff options
context:
space:
mode:
Diffstat (limited to 'hl/fortran')
-rw-r--r--hl/fortran/Makefile.in40
-rw-r--r--hl/fortran/src/Makefile.in40
-rw-r--r--hl/fortran/test/Makefile.in39
3 files changed, 45 insertions, 74 deletions
diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in
index 4773657..d2eb6f7 100644
--- a/hl/fortran/Makefile.in
+++ b/hl/fortran/Makefile.in
@@ -276,19 +276,9 @@ H5CC_PP = $(bindir)/h5pcc
H5FC = $(bindir)/h5fc
H5FC_PP = $(bindir)/h5pfc
-# .chkexe and .chksh files are used to mark tests that have run successfully.
-# 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
-
+# .chkexe files are used to mark tests that have run successfully.
+# .chklog files are output from those tests.
+CHECK_CLEANFILES = *.chkexe *.chklog
SUBDIRS = src test
# Automake needs to be taught how to build lib, progs, and tests targets.
@@ -305,8 +295,8 @@ PROGS = $(bin_PROGRAMS) $(bin_SCRIPTS) $(noinst_PROGRAMS) $(noinst_SCRIPTS) \
TESTS = $(check_PROGRAMS) $(check_SCRIPTS) $(EXTRA_TEST)
TEST_PROG_CHKEXE = $(TEST_PROG:=.chkexe_)
TEST_PROG_PARA_CHKEXE = $(TEST_PROG_PARA:=.chkexe_)
-TEST_SCRIPT_CHKSH = $(TEST_SCRIPT:=.chksh_)
-TEST_SCRIPT_PARA_CHKSH = $(TEST_SCRIPT_PARA:=.chksh_)
+TEST_SCRIPT_CHKSH = $(TEST_SCRIPT:=.chkexe_)
+TEST_SCRIPT_PARA_CHKSH = $(TEST_SCRIPT_PARA:=.chkexe_)
all: all-recursive
.SUFFIXES:
@@ -694,7 +684,7 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH)
$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \
tname=$(@:.chkexe_=)$(EXEEXT);\
- log=$(@:.chkexe_=.log); \
+ log=$(@:.chkexe_=.chklog); \
echo "============================"; \
if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \
echo "No need to test $${tname} again."; \
@@ -725,16 +715,16 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
echo "============================"; \
fi
-# The dummy.chksh here prevents the target from being
+# The dummysh.chkexe here prevents the target from being
# empty if there are no tests in the current directory.
# $${log} is the log file.
# $${tname} is the name of test.
-$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_:
- @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \
- tname=`basename $(@:.chksh_=)`;\
- log=`basename $(@:.chksh_=.logsh)`; \
+$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
+ @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummysh.chkexe_"; then \
+ tname=`basename $(@:.chkexe_=)`;\
+ log=`basename $(@:.chkexe_=.chklog)`; \
echo "============================"; \
- if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \
+ if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(@:.chkexe_=); then \
echo "No need to test $${tname} again."; \
else \
echo "============================" > $${log}; \
@@ -751,8 +741,8 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_:
echo "============================" >> $${log}; \
RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \
srcdir="$(srcdir)" \
- $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) >> $${log} 2>&1 \
- && touch `basename $(@:.chksh_=.chksh)` || \
+ $(SHELL) $(@:.chkexe_=) $(TEST_FLAGS) >> $${log} 2>&1 \
+ && touch `basename $(@:.chkexe_=.chkexe)` || \
(test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
(cat $${log} && false) || exit 1; \
echo "" >> $${log}; \
@@ -788,7 +778,7 @@ build-check-p: $(LIB) $(PROGS) $(TESTS)
test $$test = dummy || false
@for test in $(TEST_SCRIPT_PARA) dummy; do \
if test $$test != dummy; then \
- $(MAKE) $(AM_MAKEFLAGS) $$test.chksh_; \
+ $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_; \
fi; \
done; \
test $$test = dummy || false
diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in
index 7fb21b3..9017241 100644
--- a/hl/fortran/src/Makefile.in
+++ b/hl/fortran/src/Makefile.in
@@ -297,19 +297,9 @@ H5CC_PP = $(bindir)/h5pcc
H5FC = $(bindir)/h5fc
H5FC_PP = $(bindir)/h5pfc
-# .chkexe and .chksh files are used to mark tests that have run successfully.
-# 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
-
+# .chkexe files are used to mark tests that have run successfully.
+# .chklog files are output from those tests.
+CHECK_CLEANFILES = *.chkexe *.chklog
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
@@ -343,8 +333,8 @@ PROGS = $(bin_PROGRAMS) $(bin_SCRIPTS) $(noinst_PROGRAMS) $(noinst_SCRIPTS) \
TESTS = $(check_PROGRAMS) $(check_SCRIPTS) $(EXTRA_TEST)
TEST_PROG_CHKEXE = $(TEST_PROG:=.chkexe_)
TEST_PROG_PARA_CHKEXE = $(TEST_PROG_PARA:=.chkexe_)
-TEST_SCRIPT_CHKSH = $(TEST_SCRIPT:=.chksh_)
-TEST_SCRIPT_PARA_CHKSH = $(TEST_SCRIPT_PARA:=.chksh_)
+TEST_SCRIPT_CHKSH = $(TEST_SCRIPT:=.chkexe_)
+TEST_SCRIPT_PARA_CHKSH = $(TEST_SCRIPT_PARA:=.chkexe_)
all: all-am
.SUFFIXES:
@@ -741,7 +731,7 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH)
$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \
tname=$(@:.chkexe_=)$(EXEEXT);\
- log=$(@:.chkexe_=.log); \
+ log=$(@:.chkexe_=.chklog); \
echo "============================"; \
if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \
echo "No need to test $${tname} again."; \
@@ -772,16 +762,16 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
echo "============================"; \
fi
-# The dummy.chksh here prevents the target from being
+# The dummysh.chkexe here prevents the target from being
# empty if there are no tests in the current directory.
# $${log} is the log file.
# $${tname} is the name of test.
-$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_:
- @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \
- tname=`basename $(@:.chksh_=)`;\
- log=`basename $(@:.chksh_=.logsh)`; \
+$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
+ @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummysh.chkexe_"; then \
+ tname=`basename $(@:.chkexe_=)`;\
+ log=`basename $(@:.chkexe_=.chklog)`; \
echo "============================"; \
- if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \
+ if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(@:.chkexe_=); then \
echo "No need to test $${tname} again."; \
else \
echo "============================" > $${log}; \
@@ -798,8 +788,8 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_:
echo "============================" >> $${log}; \
RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \
srcdir="$(srcdir)" \
- $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) >> $${log} 2>&1 \
- && touch `basename $(@:.chksh_=.chksh)` || \
+ $(SHELL) $(@:.chkexe_=) $(TEST_FLAGS) >> $${log} 2>&1 \
+ && touch `basename $(@:.chkexe_=.chkexe)` || \
(test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
(cat $${log} && false) || exit 1; \
echo "" >> $${log}; \
@@ -835,7 +825,7 @@ build-check-p: $(LIB) $(PROGS) $(TESTS)
test $$test = dummy || false
@for test in $(TEST_SCRIPT_PARA) dummy; do \
if test $$test != dummy; then \
- $(MAKE) $(AM_MAKEFLAGS) $$test.chksh_; \
+ $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_; \
fi; \
done; \
test $$test = dummy || false
diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in
index 15dbe8c..7a15e6e 100644
--- a/hl/fortran/test/Makefile.in
+++ b/hl/fortran/test/Makefile.in
@@ -296,20 +296,11 @@ H5CC_PP = $(bindir)/h5pcc
H5FC = $(bindir)/h5fc
H5FC_PP = $(bindir)/h5pfc
-# .chkexe and .chksh files are used to mark tests that have run successfully.
-# 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.
+# .chkexe files are used to mark tests that have run successfully.
+# .chklog files are output from those tests.
# Temporary 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 \
- dsetf[1-4].h5 f1img.h5 f1tab.h5
+CHECK_CLEANFILES = *.chkexe *.chklog 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
@@ -339,8 +330,8 @@ PROGS = $(bin_PROGRAMS) $(bin_SCRIPTS) $(noinst_PROGRAMS) $(noinst_SCRIPTS) \
TESTS = $(check_PROGRAMS) $(check_SCRIPTS) $(EXTRA_TEST)
TEST_PROG_CHKEXE = $(TEST_PROG:=.chkexe_)
TEST_PROG_PARA_CHKEXE = $(TEST_PROG_PARA:=.chkexe_)
-TEST_SCRIPT_CHKSH = $(TEST_SCRIPT:=.chksh_)
-TEST_SCRIPT_PARA_CHKSH = $(TEST_SCRIPT_PARA:=.chksh_)
+TEST_SCRIPT_CHKSH = $(TEST_SCRIPT:=.chkexe_)
+TEST_SCRIPT_PARA_CHKSH = $(TEST_SCRIPT_PARA:=.chkexe_)
all: all-am
.SUFFIXES:
@@ -658,7 +649,7 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH)
$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
@if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \
tname=$(@:.chkexe_=)$(EXEEXT);\
- log=$(@:.chkexe_=.log); \
+ log=$(@:.chkexe_=.chklog); \
echo "============================"; \
if $(top_srcdir)/bin/newer $(@:.chkexe_=.chkexe) $${tname}; then \
echo "No need to test $${tname} again."; \
@@ -689,16 +680,16 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_:
echo "============================"; \
fi
-# The dummy.chksh here prevents the target from being
+# The dummysh.chkexe here prevents the target from being
# empty if there are no tests in the current directory.
# $${log} is the log file.
# $${tname} is the name of test.
-$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_:
- @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \
- tname=`basename $(@:.chksh_=)`;\
- log=`basename $(@:.chksh_=.logsh)`; \
+$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummysh.chkexe_:
+ @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummysh.chkexe_"; then \
+ tname=`basename $(@:.chkexe_=)`;\
+ log=`basename $(@:.chkexe_=.chklog)`; \
echo "============================"; \
- if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \
+ if $(top_srcdir)/bin/newer `basename $(@:.chkexe_=.chkexe)` $(@:.chkexe_=); then \
echo "No need to test $${tname} again."; \
else \
echo "============================" > $${log}; \
@@ -715,8 +706,8 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_:
echo "============================" >> $${log}; \
RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \
srcdir="$(srcdir)" \
- $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) >> $${log} 2>&1 \
- && touch `basename $(@:.chksh_=.chksh)` || \
+ $(SHELL) $(@:.chkexe_=) $(TEST_FLAGS) >> $${log} 2>&1 \
+ && touch `basename $(@:.chkexe_=.chkexe)` || \
(test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
(cat $${log} && false) || exit 1; \
echo "" >> $${log}; \
@@ -752,7 +743,7 @@ build-check-p: $(LIB) $(PROGS) $(TESTS)
test $$test = dummy || false
@for test in $(TEST_SCRIPT_PARA) dummy; do \
if test $$test != dummy; then \
- $(MAKE) $(AM_MAKEFLAGS) $$test.chksh_; \
+ $(MAKE) $(AM_MAKEFLAGS) $$test.chkexe_; \
fi; \
done; \
test $$test = dummy || false