diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2005-07-07 20:46:49 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2005-07-07 20:46:49 (GMT) |
| commit | 9b597516c0d0e0518fde412710314dcd1a35464b (patch) | |
| tree | 5c0933e04ae440cbdeceb39f645ddc981ef628d3 /fortran | |
| parent | ec540aa9cbbc02e3abd2d4302df65dff0e189af3 (diff) | |
| download | hdf5-9b597516c0d0e0518fde412710314dcd1a35464b.zip hdf5-9b597516c0d0e0518fde412710314dcd1a35464b.tar.gz hdf5-9b597516c0d0e0518fde412710314dcd1a35464b.tar.bz2 | |
[svn-r11042] Purpose:
Bug fix
Description:
The ".chksh" file for a test script was being created in the "source"
location rather than the build location. This can cause problems when
multiple builds are running because "slower" machines will see the ".cshsh"
file from faster machines and will not run the test script as they should.
Solution:
Use 'basename' command to strip off the path of the script and create
the ".chksh" file in the build location.
Platforms tested:
FreeBSD 4.11 (sleipnir)
h5committest
Diffstat (limited to 'fortran')
| -rw-r--r-- | fortran/Makefile.in | 14 | ||||
| -rw-r--r-- | fortran/examples/Makefile.in | 14 | ||||
| -rw-r--r-- | fortran/src/Makefile.in | 14 | ||||
| -rw-r--r-- | fortran/test/Makefile.in | 14 | ||||
| -rw-r--r-- | fortran/testpar/Makefile.in | 14 |
5 files changed, 35 insertions, 35 deletions
diff --git a/fortran/Makefile.in b/fortran/Makefile.in index fc864d1..69a0d9b 100644 --- a/fortran/Makefile.in +++ b/fortran/Makefile.in @@ -727,25 +727,25 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if $(top_srcdir)/bin/newer $(@:.chksh_=.chksh) $(@:.chksh_=); then \ - echo "No need to test $(@:.chksh_=) again."; \ + if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ + echo "No need to test `basename $(@:.chksh_=)` again."; \ else \ if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing $(@:.chksh_=) $(TEST_FLAGS)"; \ + echo "Fortran API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing $(@:.chksh_=) $(TEST_FLAGS)"; \ + echo "C++ API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ else \ - echo "Testing $(@:.chksh_=) $(TEST_FLAGS)"; \ + echo "Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ fi; \ echo "============================"; \ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \ - && touch $(@:.chksh_=.chksh) || \ + && touch `basename $(@:.chksh_=.chksh)` || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ exit 1; \ echo ""; \ - echo "Finished testing $(@:.chksh_=) $(TEST_FLAGS)"; \ + echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ fi; \ echo "============================"; \ fi diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in index 74cc00c..728c2cd 100644 --- a/fortran/examples/Makefile.in +++ b/fortran/examples/Makefile.in @@ -632,25 +632,25 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if $(top_srcdir)/bin/newer $(@:.chksh_=.chksh) $(@:.chksh_=); then \ - echo "No need to test $(@:.chksh_=) again."; \ + if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ + echo "No need to test `basename $(@:.chksh_=)` again."; \ else \ if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing $(@:.chksh_=) $(TEST_FLAGS)"; \ + echo "Fortran API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing $(@:.chksh_=) $(TEST_FLAGS)"; \ + echo "C++ API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ else \ - echo "Testing $(@:.chksh_=) $(TEST_FLAGS)"; \ + echo "Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ fi; \ echo "============================"; \ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \ - && touch $(@:.chksh_=.chksh) || \ + && touch `basename $(@:.chksh_=.chksh)` || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ exit 1; \ echo ""; \ - echo "Finished testing $(@:.chksh_=) $(TEST_FLAGS)"; \ + echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ fi; \ echo "============================"; \ fi diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index f11d3bc..879c5f0 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -924,25 +924,25 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if $(top_srcdir)/bin/newer $(@:.chksh_=.chksh) $(@:.chksh_=); then \ - echo "No need to test $(@:.chksh_=) again."; \ + if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ + echo "No need to test `basename $(@:.chksh_=)` again."; \ else \ if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing $(@:.chksh_=) $(TEST_FLAGS)"; \ + echo "Fortran API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing $(@:.chksh_=) $(TEST_FLAGS)"; \ + echo "C++ API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ else \ - echo "Testing $(@:.chksh_=) $(TEST_FLAGS)"; \ + echo "Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ fi; \ echo "============================"; \ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \ - && touch $(@:.chksh_=.chksh) || \ + && touch `basename $(@:.chksh_=.chksh)` || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ exit 1; \ echo ""; \ - echo "Finished testing $(@:.chksh_=) $(TEST_FLAGS)"; \ + echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ fi; \ echo "============================"; \ fi diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in index 39e3f86..5c4e3ab 100644 --- a/fortran/test/Makefile.in +++ b/fortran/test/Makefile.in @@ -889,25 +889,25 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if $(top_srcdir)/bin/newer $(@:.chksh_=.chksh) $(@:.chksh_=); then \ - echo "No need to test $(@:.chksh_=) again."; \ + if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ + echo "No need to test `basename $(@:.chksh_=)` again."; \ else \ if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing $(@:.chksh_=) $(TEST_FLAGS)"; \ + echo "Fortran API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing $(@:.chksh_=) $(TEST_FLAGS)"; \ + echo "C++ API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ else \ - echo "Testing $(@:.chksh_=) $(TEST_FLAGS)"; \ + echo "Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ fi; \ echo "============================"; \ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \ - && touch $(@:.chksh_=.chksh) || \ + && touch `basename $(@:.chksh_=.chksh)` || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ exit 1; \ echo ""; \ - echo "Finished testing $(@:.chksh_=) $(TEST_FLAGS)"; \ + echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ fi; \ echo "============================"; \ fi diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in index 8aff4bd..fec16f7 100644 --- a/fortran/testpar/Makefile.in +++ b/fortran/testpar/Makefile.in @@ -657,25 +657,25 @@ $(TEST_PROG_CHKEXE) $(TEST_PROG_PARA_CHKEXE) dummy.chkexe_: $(TEST_SCRIPT_CHKSH) $(TEST_SCRIPT_PARA_CHKSH) dummy.chksh_: @if test "X$@" != "X.chksh_" && test "X$@" != "Xdummy.chksh_"; then \ echo "============================"; \ - if $(top_srcdir)/bin/newer $(@:.chksh_=.chksh) $(@:.chksh_=); then \ - echo "No need to test $(@:.chksh_=) again."; \ + if $(top_srcdir)/bin/newer `basename $(@:.chksh_=.chksh)` $(@:.chksh_=); then \ + echo "No need to test `basename $(@:.chksh_=)` again."; \ else \ if test "X$(HDF_FORTRAN)" = "Xyes"; then \ - echo "Fortran API: Testing $(@:.chksh_=) $(TEST_FLAGS)"; \ + echo "Fortran API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ elif test "X$(HDF_CXX)" = "Xyes"; then \ - echo "C++ API: Testing $(@:.chksh_=) $(TEST_FLAGS)"; \ + echo "C++ API: Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ else \ - echo "Testing $(@:.chksh_=) $(TEST_FLAGS)"; \ + echo "Testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ fi; \ echo "============================"; \ RUNSERIAL="$(RUNSERIAL)" RUNPARALLEL="$(RUNPARALLEL)" \ srcdir="$(srcdir)" \ $(SHELL) $(@:.chksh_=) $(TEST_FLAGS) \ - && touch $(@:.chksh_=.chksh) || \ + && touch `basename $(@:.chksh_=.chksh)` || \ (test $$HDF5_Make_Ignore && echo "*** Error ignored") || \ exit 1; \ echo ""; \ - echo "Finished testing $(@:.chksh_=) $(TEST_FLAGS)"; \ + echo "Finished testing `basename $(@:.chksh_=)` $(TEST_FLAGS)"; \ fi; \ echo "============================"; \ fi |