diff options
Diffstat (limited to 'hl')
| -rwxr-xr-x | hl/Makefile.in | 40 | ||||
| -rw-r--r-- | hl/c++/Makefile.in | 40 | ||||
| -rw-r--r-- | hl/c++/src/Makefile.in | 40 | ||||
| -rw-r--r-- | hl/c++/test/Makefile.in | 40 | ||||
| -rw-r--r-- | hl/fortran/Makefile.in | 40 | ||||
| -rw-r--r-- | hl/fortran/src/Makefile.in | 40 | ||||
| -rw-r--r-- | hl/fortran/test/Makefile.in | 39 | ||||
| -rw-r--r-- | hl/src/Makefile.in | 40 | ||||
| -rw-r--r-- | hl/test/Makefile.in | 42 | ||||
| -rw-r--r-- | hl/tools/gif2h5/Makefile.in | 40 |
10 files changed, 152 insertions, 249 deletions
diff --git a/hl/Makefile.in b/hl/Makefile.in index 8628ce2..4a1b595 100755 --- a/hl/Makefile.in +++ b/hl/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 @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) @@ -307,8 +297,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: @@ -696,7 +686,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."; \ @@ -727,16 +717,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}; \ @@ -753,8 +743,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}; \ @@ -790,7 +780,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/c++/Makefile.in b/hl/c++/Makefile.in index 67646eb..322e146 100644 --- a/hl/c++/Makefile.in +++ b/hl/c++/Makefile.in @@ -281,19 +281,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. @@ -310,8 +300,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: @@ -699,7 +689,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."; \ @@ -730,16 +720,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}; \ @@ -756,8 +746,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}; \ @@ -793,7 +783,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/c++/src/Makefile.in b/hl/c++/src/Makefile.in index 8b89122..43d19d1 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -303,19 +303,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 # Include src directory INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/hl/src @@ -349,8 +339,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: @@ -720,7 +710,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."; \ @@ -751,16 +741,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}; \ @@ -777,8 +767,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}; \ @@ -814,7 +804,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/c++/test/Makefile.in b/hl/c++/test/Makefile.in index 6f08b9a..c95c1b0 100644 --- a/hl/c++/test/Makefile.in +++ b/hl/c++/test/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 # Include directories INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/hl/src -I$(top_srcdir)/hl/c++/src -I$(top_srcdir)/test @@ -339,8 +329,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: @@ -668,7 +658,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."; \ @@ -699,16 +689,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}; \ @@ -725,8 +715,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}; \ @@ -762,7 +752,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/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 diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in index ea344a7..1534ab6 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -294,19 +294,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 # Add include directories to the C preprocessor flags AM_CPPFLAGS = -I$(top_srcdir)/src @@ -332,8 +322,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: @@ -708,7 +698,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."; \ @@ -739,16 +729,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}; \ @@ -765,8 +755,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}; \ @@ -802,7 +792,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/test/Makefile.in b/hl/test/Makefile.in index 7139119..e02c6fc 100644 --- a/hl/test/Makefile.in +++ b/hl/test/Makefile.in @@ -306,21 +306,13 @@ 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. These files are the ones created by running `make test'. -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 \ - 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 +CHECK_CLEANFILES = *.chkexe *.chklog 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 # Add include directories to C preprocessor flags AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/src -I$(top_srcdir)/src -I$(top_srcdir)/hl/src @@ -346,8 +338,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: @@ -691,7 +683,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."; \ @@ -722,16 +714,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}; \ @@ -748,8 +740,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}; \ @@ -785,7 +777,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/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in index 23d199a..24cdd44 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/Makefile.in @@ -304,19 +304,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 # Include src and tools/lib directories INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib @@ -340,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: @@ -702,7 +692,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."; \ @@ -733,16 +723,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}; \ @@ -759,8 +749,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}; \ @@ -796,7 +786,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 |