summaryrefslogtreecommitdiffstats
path: root/hl/fortran
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2005-07-07 20:46:49 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2005-07-07 20:46:49 (GMT)
commit9b597516c0d0e0518fde412710314dcd1a35464b (patch)
tree5c0933e04ae440cbdeceb39f645ddc981ef628d3 /hl/fortran
parentec540aa9cbbc02e3abd2d4302df65dff0e189af3 (diff)
downloadhdf5-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 'hl/fortran')
-rw-r--r--hl/fortran/Makefile.in14
-rw-r--r--hl/fortran/src/Makefile.in14
-rw-r--r--hl/fortran/test/Makefile.in14
3 files changed, 21 insertions, 21 deletions
diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in
index 4d156ed..bfef25d 100644
--- a/hl/fortran/Makefile.in
+++ b/hl/fortran/Makefile.in
@@ -690,25 +690,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/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in
index 9ad5b74..40205f9 100644
--- a/hl/fortran/src/Makefile.in
+++ b/hl/fortran/src/Makefile.in
@@ -741,25 +741,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/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in
index 9544efc..afbcd3a 100644
--- a/hl/fortran/test/Makefile.in
+++ b/hl/fortran/test/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