From 538d37a1bcc15a600c71fad0566d8480c2344ee6 Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Fri, 26 Aug 2005 17:24:27 -0500 Subject: [svn-r11303] Purpose: minor tidy up. Description: Changed both test programs and test scripts to use the same suffixes (.chkexe and .chklog). Changed from .log to .chklog to avoid running into potential conflicts by other "things" (e.g., config.log). Tested: Heping. --- Makefile.in | 16 +++---------- c++/Makefile.in | 40 ++++++++++++------------------- c++/examples/Makefile.in | 38 ++++++++++++----------------- c++/src/Makefile.in | 40 ++++++++++++------------------- c++/test/Makefile.in | 40 ++++++++++++------------------- config/commence.am | 15 +++--------- config/conclude.am | 24 +++++++++---------- examples/Makefile.in | 38 ++++++++++++----------------- fortran/Makefile.in | 40 ++++++++++++------------------- fortran/examples/Makefile.in | 40 ++++++++++++------------------- fortran/src/Makefile.in | 40 ++++++++++++------------------- fortran/test/Makefile.in | 38 ++++++++++++----------------- fortran/testpar/Makefile.in | 39 ++++++++++++------------------ hl/Makefile.in | 40 ++++++++++++------------------- hl/c++/Makefile.in | 40 ++++++++++++------------------- hl/c++/src/Makefile.in | 40 ++++++++++++------------------- hl/c++/test/Makefile.in | 40 ++++++++++++------------------- hl/fortran/Makefile.in | 40 ++++++++++++------------------- hl/fortran/src/Makefile.in | 40 ++++++++++++------------------- hl/fortran/test/Makefile.in | 39 ++++++++++++------------------ hl/src/Makefile.in | 40 ++++++++++++------------------- hl/test/Makefile.in | 42 +++++++++++++------------------- hl/tools/gif2h5/Makefile.in | 40 ++++++++++++------------------- perform/Makefile.in | 40 ++++++++++++------------------- src/Makefile.in | 40 ++++++++++++------------------- test/Makefile.in | 57 +++++++++++++++++++------------------------- testpar/Makefile.in | 39 ++++++++++++------------------ tools/Makefile.in | 40 ++++++++++++------------------- tools/gifconv/Makefile.in | 40 ++++++++++++------------------- tools/h5diff/Makefile.in | 39 ++++++++++++------------------ tools/h5dump/Makefile.in | 38 ++++++++++++----------------- tools/h5import/Makefile.in | 40 ++++++++++++------------------- tools/h5jam/Makefile.in | 39 ++++++++++++------------------ tools/h5ls/Makefile.in | 40 ++++++++++++------------------- tools/h5repack/Makefile.in | 38 ++++++++++++----------------- tools/lib/Makefile.in | 40 ++++++++++++------------------- tools/misc/Makefile.in | 40 +++++++++++++------------------ 37 files changed, 540 insertions(+), 879 deletions(-) diff --git a/Makefile.in b/Makefile.in index 9e95077..496427e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -310,19 +310,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_PARALLEL_CONDITIONAL_FALSE@TESTPARALLEL_DIR = # Define subdirectories to build. diff --git a/c++/Makefile.in b/c++/Makefile.in index 1886259..9493d61 100644 --- a/c++/Makefile.in +++ b/c++/Makefile.in @@ -280,19 +280,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_CXX_CONDITIONAL_TRUE@SUBDIRS = src test DIST_SUBDIRS = src test examples @@ -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: @@ -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/c++/examples/Makefile.in b/c++/examples/Makefile.in index 6f07a84..356ae90 100644 --- a/c++/examples/Makefile.in +++ b/c++/examples/Makefile.in @@ -272,21 +272,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. # 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. -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 *.h5 +CHECK_CLEANFILES = *.chkexe *.chklog *.h5 # Use h5c++ to build examples, instead of reguar C++ compiler H5CPP = $(bindir)/h5c++ @@ -326,8 +318,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: @@ -617,7 +609,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."; \ @@ -648,16 +640,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}; \ @@ -674,8 +666,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}; \ @@ -711,7 +703,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/c++/src/Makefile.in b/c++/src/Makefile.in index 78b3824..1a27dbe 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -314,19 +314,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 @@ -380,8 +370,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: @@ -806,7 +796,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."; \ @@ -837,16 +827,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}; \ @@ -863,8 +853,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}; \ @@ -900,7 +890,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/c++/test/Makefile.in b/c++/test/Makefile.in index 21ab43e..b47de55 100644 --- a/c++/test/Makefile.in +++ b/c++/test/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, test, and c++/src directories INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/c++/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: @@ -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/config/commence.am b/config/commence.am index 646d0bf..d2189c5 100644 --- a/config/commence.am +++ b/config/commence.am @@ -53,18 +53,9 @@ AUTOHEADER=/afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheade AUTOMAKE=/afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake AUTOCONF=/afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf -# .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 # 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 5e0362b..88c7d3b 100644 --- a/config/conclude.am +++ b/config/conclude.am @@ -75,8 +75,8 @@ build-check-s: $(LIB) $(PROGS) $(TESTS) 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_) _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) @@ -87,7 +87,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."; \ @@ -118,16 +118,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}; \ @@ -144,8 +144,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}; \ @@ -181,7 +181,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/examples/Makefile.in b/examples/Makefile.in index a505c06..a524031 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -272,17 +272,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 *.h5 +# .chkexe files are used to mark tests that have run successfully. +# .chklog files are output from those tests. +CHECK_CLEANFILES = *.chkexe *.chklog *.h5 @BUILD_PARALLEL_CONDITIONAL_TRUE@TEST_PROG_PARA = ph5example # Example programs. @@ -331,8 +323,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: @@ -631,7 +623,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."; \ @@ -662,16 +654,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}; \ @@ -688,8 +680,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}; \ @@ -725,7 +717,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/fortran/Makefile.in b/fortran/Makefile.in index 447c523..213fd22 100644 --- a/fortran/Makefile.in +++ b/fortran/Makefile.in @@ -284,19 +284,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_PARALLEL_CONDITIONAL_TRUE@TESTPARALLEL_DIR = testpar # Subdirectories in build order, not including examples directory @@ -319,8 +309,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: @@ -729,7 +719,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."; \ @@ -760,16 +750,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}; \ @@ -786,8 +776,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}; \ @@ -823,7 +813,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/fortran/examples/Makefile.in b/fortran/examples/Makefile.in index 26931f6..0753a52 100644 --- a/fortran/examples/Makefile.in +++ b/fortran/examples/Makefile.in @@ -272,19 +272,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 # Compile parallel fortran examples only if parallel is enabled @BUILD_PARALLEL_CONDITIONAL_TRUE@TEST_PROG_PARA = ph5example @@ -334,8 +324,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: @@ -641,7 +631,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."; \ @@ -672,16 +662,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}; \ @@ -698,8 +688,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}; \ @@ -735,7 +725,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/fortran/src/Makefile.in b/fortran/src/Makefile.in index 98f6209..69d55c5 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -339,19 +339,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 in both Fortran and C flags (C compiler is used # for linking). @@ -429,8 +419,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: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) all-am @@ -925,7 +915,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."; \ @@ -956,16 +946,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}; \ @@ -982,8 +972,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}; \ @@ -1019,7 +1009,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/fortran/test/Makefile.in b/fortran/test/Makefile.in index a02a7c9..52fdc92 100644 --- a/fortran/test/Makefile.in +++ b/fortran/test/Makefile.in @@ -341,19 +341,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 *.h5 +CHECK_CLEANFILES = *.chkexe *.chklog *.h5 # Include files AM_FCFLAGS = -I$(top_builddir)/fortran/src $(F9XMODFLAG)$(top_builddir)/fortran/src @@ -408,8 +400,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: @@ -895,7 +887,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."; \ @@ -926,16 +918,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}; \ @@ -952,8 +944,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}; \ @@ -989,7 +981,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/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in index 06bb739..0f50653 100644 --- a/fortran/testpar/Makefile.in +++ b/fortran/testpar/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 \ - parf[12].h5 +CHECK_CLEANFILES = *.chkexe *.chklog parf[12].h5 # Include files AM_FCFLAGS = -I$(top_srcdir)/fortran/src -I$(top_srcdir)/fortran/test $(F9XMODFLAG)$(top_builddir)/fortran/src @@ -343,8 +334,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: @@ -656,7 +647,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."; \ @@ -687,16 +678,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}; \ @@ -713,8 +704,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}; \ @@ -750,7 +741,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/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 diff --git a/perform/Makefile.in b/perform/Makefile.in index 82b6fdc..8cbca4f 100644 --- a/perform/Makefile.in +++ b/perform/Makefile.in @@ -325,19 +325,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)/test -I$(top_srcdir)/tools/lib @BUILD_PARALLEL_CONDITIONAL_TRUE@TEST_PROG_PARA = h5perf @@ -373,8 +363,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: @@ -761,7 +751,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."; \ @@ -792,16 +782,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}; \ @@ -818,8 +808,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}; \ @@ -855,7 +845,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/src/Makefile.in b/src/Makefile.in index 109c53f..082cad0 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -340,19 +340,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 libtool shared library version numbers to the HDF5 library # See libtool versioning documentation online. @@ -434,8 +424,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: H5config.h $(MAKE) $(AM_MAKEFLAGS) all-am @@ -1022,7 +1012,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."; \ @@ -1053,16 +1043,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}; \ @@ -1079,8 +1069,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}; \ @@ -1116,7 +1106,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/test/Makefile.in b/test/Makefile.in index 57b95d7..cf071f4 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -492,33 +492,24 @@ 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 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. -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 \ - 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 \ +CHECK_CLEANFILES = *.chkexe *.chklog 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 \ @@ -581,8 +572,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: @@ -1120,7 +1111,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."; \ @@ -1151,16 +1142,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}; \ @@ -1177,8 +1168,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}; \ @@ -1214,7 +1205,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/testpar/Makefile.in b/testpar/Makefile.in index 0cb208d..0a7aea4 100644 --- a/testpar/Makefile.in +++ b/testpar/Makefile.in @@ -305,23 +305,14 @@ 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 # MPItest.h5 is from t_mpi # Para*.h5 are from testphdf # *.clog are from MPE option -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 \ - MPItest.h5 Para*.h5 +CHECK_CLEANFILES = *.chkexe *.chklog MPItest.h5 Para*.h5 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/test # Test programs and scripts. These are our main targets. @@ -352,8 +343,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: @@ -699,7 +690,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 +721,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 +747,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 +784,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/tools/Makefile.in b/tools/Makefile.in index a7c1ba9..ea80007 100644 --- a/tools/Makefile.in +++ b/tools/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 # All subdirectories SUBDIRS = lib h5dump h5diff h5ls misc gifconv h5import h5repack h5jam @@ -312,8 +302,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: @@ -701,7 +691,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."; \ @@ -732,16 +722,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}; \ @@ -758,8 +748,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}; \ @@ -795,7 +785,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/tools/gifconv/Makefile.in b/tools/gifconv/Makefile.in index 23d199a..24cdd44 100644 --- a/tools/gifconv/Makefile.in +++ b/tools/gifconv/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 diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in index 6e3fbea..6b19b3c 100644 --- a/tools/h5diff/Makefile.in +++ b/tools/h5diff/Makefile.in @@ -312,21 +312,12 @@ 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. *.h5 are generated by h5diff. They should # be copied to the testfiles/ directory if update is required -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 *.h5 \ - expect_sorted actual_sorted +CHECK_CLEANFILES = *.chkexe *.chklog *.h5 expect_sorted actual_sorted # Include src and tools/lib directories INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib @@ -365,8 +356,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: @@ -739,7 +730,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."; \ @@ -770,16 +761,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}; \ @@ -796,8 +787,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}; \ @@ -833,7 +824,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/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in index b438350..2a822a1 100644 --- a/tools/h5dump/Makefile.in +++ b/tools/h5dump/Makefile.in @@ -305,20 +305,12 @@ 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. *.h5 are generated by h5dumpgentest. They should # copied to the testfiles/ directory if update is required. -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 *.h5 +CHECK_CLEANFILES = *.chkexe *.chklog *.h5 # Include files in /src directory and /tools/lib directory INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/tools/lib @@ -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: @@ -714,7 +706,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."; \ @@ -745,16 +737,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}; \ @@ -771,8 +763,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}; \ @@ -808,7 +800,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/tools/h5import/Makefile.in b/tools/h5import/Makefile.in index bd78a4c..72fde7d 100755 --- a/tools/h5import/Makefile.in +++ b/tools/h5import/Makefile.in @@ -305,19 +305,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 @@ -344,8 +334,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: @@ -709,7 +699,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."; \ @@ -740,16 +730,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}; \ @@ -766,8 +756,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}; \ @@ -803,7 +793,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/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in index afe795d..e79995d 100644 --- a/tools/h5jam/Makefile.in +++ b/tools/h5jam/Makefile.in @@ -300,21 +300,12 @@ 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. *.h5 are generated by jamgentest. They should # copied to the testfiles/ directory if update is required. -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 *.h5 \ - *.txt +CHECK_CLEANFILES = *.chkexe *.chklog *.h5 *.txt # # Copyright by the Board of Trustees of the University of Illinois. @@ -355,8 +346,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: @@ -735,7 +726,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."; \ @@ -766,16 +757,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}; \ @@ -792,8 +783,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}; \ @@ -829,7 +820,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/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in index 88291f9..625779a 100644 --- a/tools/h5ls/Makefile.in +++ b/tools/h5ls/Makefile.in @@ -298,19 +298,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 @@ -336,8 +326,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: @@ -689,7 +679,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."; \ @@ -720,16 +710,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}; \ @@ -746,8 +736,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}; \ @@ -783,7 +773,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/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in index 7d2a9d1..bda6e9c 100644 --- a/tools/h5repack/Makefile.in +++ b/tools/h5repack/Makefile.in @@ -320,20 +320,12 @@ 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. *.h5 are generated by h5repack. They should # copied to the testfiles/ directory if update is required. -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 *.h5 +CHECK_CLEANFILES = *.chkexe *.chklog *.h5 # Include src, test, and tools/lib directories INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/test -I$(top_srcdir)/tools/lib @@ -372,8 +364,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: @@ -764,7 +756,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."; \ @@ -795,16 +787,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}; \ @@ -821,8 +813,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}; \ @@ -858,7 +850,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/tools/lib/Makefile.in b/tools/lib/Makefile.in index 8d0d70a..a200619 100644 --- a/tools/lib/Makefile.in +++ b/tools/lib/Makefile.in @@ -302,19 +302,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 files in /src directory INCLUDES = -I$(top_srcdir)/src @@ -353,8 +343,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: @@ -706,7 +696,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."; \ @@ -737,16 +727,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}; \ @@ -763,8 +753,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}; \ @@ -800,7 +790,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/tools/misc/Makefile.in b/tools/misc/Makefile.in index 4f20c8d..2ffbd3a 100644 --- a/tools/misc/Makefile.in +++ b/tools/misc/Makefile.in @@ -324,22 +324,14 @@ 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. *.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. -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 *.h5 \ - ../testfiles/fst_family*.h5 ../testfiles/scd_family*.h5 +CHECK_CLEANFILES = *.chkexe *.chklog *.h5 ../testfiles/fst_family*.h5 \ + ../testfiles/scd_family*.h5 # Include src directory INCLUDES = -I$(top_srcdir)/src @@ -381,8 +373,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: @@ -796,7 +788,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."; \ @@ -827,16 +819,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}; \ @@ -853,8 +845,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}; \ @@ -890,7 +882,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 -- cgit v0.12