diff options
| author | James Laird <jlaird@hdfgroup.org> | 2005-07-01 21:22:05 (GMT) |
|---|---|---|
| committer | James Laird <jlaird@hdfgroup.org> | 2005-07-01 21:22:05 (GMT) |
| commit | 4cf99e9f288d42bc756f1585c72ad584620fdec9 (patch) | |
| tree | 6afb773f29111823616e8053c07f902879a5a6ef /tools/h5ls | |
| parent | 0c4c63411776a44a9721c9ef26e96a6e2f225b99 (diff) | |
| download | hdf5-4cf99e9f288d42bc756f1585c72ad584620fdec9.zip hdf5-4cf99e9f288d42bc756f1585c72ad584620fdec9.tar.gz hdf5-4cf99e9f288d42bc756f1585c72ad584620fdec9.tar.bz2 | |
[svn-r11013] Purpose:
Bug fix
Description:
Fixed bugs that caused tests to be unable to find testhdf5.sh during
daily tests, and another that broke sol and shanti.
Solution:
When tests are run, their path is ./$testname .
When scripts are run, their path has no leading "./". Fixed.
Sol and shanti don't recognize the -e option for test, but they do know
-f. Fixed.
Also modified release notes.
Platforms tested:
mir, shanti, heping
Diffstat (limited to 'tools/h5ls')
| -rw-r--r-- | tools/h5ls/Makefile.in | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in index e3582a0..2d464e0 100644 --- a/tools/h5ls/Makefile.in +++ b/tools/h5ls/Makefile.in @@ -657,10 +657,10 @@ _exec_check-s: $(TEST_PROG_CHKEXE) $(TEST_SCRIPT_CHKSH) # The .chkexe_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: - @if test "X$@" != "X.chkexe_"; then \ +$(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: + @if test "X$@" != "X.chkexe_" && test "X$@" != "Xdummy.chkexe_"; then \ echo "============================"; \ - if test -e $(@:.chkexe_=.chkexe) && \ + if test -f $(@:.chkexe_=.chkexe) && \ test $(@:.chkexe_=.chkexe) -nt $(@:.chkexe_=)$(EXEEXT); then \ echo "No need to test $(@:.chkexe_=)$(EXEEXT) again."; \ else \ @@ -685,10 +685,10 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) .chkexe_: # The .chksh_ here is the "dummy" that prevents the target from being # empty if there are no tests in the current directory. -$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: - @if test "X$@" != "X.chksh_"; then \ +$(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: + @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if test -e $(@:.chksh_=.chksh) && \ + if test -f $(@:.chksh_=.chksh) && \ test $(@:.chksh_=.chksh) -nt $(@:.chksh_=); then \ echo "No need to test $(@:.chksh_=) again."; \ else \ @@ -702,7 +702,7 @@ $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) .chksh_: echo "============================"; \ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ - $(SHELL) ./$(@:.chksh_=) $(TEST_FLAGS) \ + $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \ && touch $(@:.chksh_=.chksh) || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ exit 1; \ |