summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorJames Laird <jlaird@hdfgroup.org>2005-03-31 18:26:17 (GMT)
committerJames Laird <jlaird@hdfgroup.org>2005-03-31 18:26:17 (GMT)
commit59ec5b3d661c87b69b00cadf67287184f8544dbd (patch)
treeda2063df76f74a75d2ab85c5606e36ece4a9fa13 /config
parent54f0b6c66d3b1746b326b7f7a1072854376a15d7 (diff)
downloadhdf5-59ec5b3d661c87b69b00cadf67287184f8544dbd.zip
hdf5-59ec5b3d661c87b69b00cadf67287184f8544dbd.tar.gz
hdf5-59ec5b3d661c87b69b00cadf67287184f8544dbd.tar.bz2
[svn-r10517] Purpose:
Bug fix Description: On some machines, $RUNSERIAL variable needs to be used to run tests. Set $RUNTESTS (which is used for non-parallel tests) to be $RUNSERIAL in configure.am. Also, since I was updating all Makefiles.in anyway, I updated commence.am to point to autotools installs in AFS instead of those on heping. Platforms tested: mir, sleipnir, modi4, copper
Diffstat (limited to 'config')
-rw-r--r--config/commence.am20
-rw-r--r--config/conclude.am2
2 files changed, 16 insertions, 6 deletions
diff --git a/config/commence.am b/config/commence.am
index 4e936e1..23c26ad 100644
--- a/config/commence.am
+++ b/config/commence.am
@@ -12,6 +12,15 @@ CP=cp
# configure's automatic SHELL detection may not work on the build machine.
SHELL=/bin/sh
+# Some machines need a command to run executables; this is that command
+# so that our tests will run.
+# We use RUNTESTS instead of RUNSERIAL directly because it may be that
+# some tests need to be run with a different command. Older versions
+# of the makefiles used the command
+# $(LIBTOOL) --mode=execute
+# in some directories, for instance.
+RUNTESTS=$(RUNSERIAL)
+
# Libraries to link to while building
LIBHDF5=$(top_builddir)/src/libhdf5.la
LIBH5TEST=$(top_builddir)/test/libh5test.la
@@ -37,9 +46,10 @@ H5FC_PP=$(bindir)/h5pfc
F9XMODEXT=@F9XMODEXT@
F9XMODFLAG=@F9XMODFLAG@
-# Set the paths for autotools to be correct on heping.
+# Set the paths for AFS installs of autotools for Linux machines
# Ideally, these tools should never be needed during the build.
-ACLOCAL=/usr/bin/aclocal
-AUTOCONF=/usr/local/autoconf-2.59/bin/autoconf
-AUTOMAKE=/usr/bin/automake
-AUTOHEADER=/usr/local/autoconf-2.59/bin/autoheader
+ACLOCAL=/afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal
+AUTOHEADER=/afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader
+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
+
diff --git a/config/conclude.am b/config/conclude.am
index 19b61f5..6354196 100644
--- a/config/conclude.am
+++ b/config/conclude.am
@@ -64,7 +64,7 @@ test _test: $(PROGS) $(TESTS)
fi; \
echo "============================"; \
srcdir="$(srcdir)" \
- $(RUNTEST) ./$$test $(TEST_FLAGS) || \
+ $(RUNTESTS) ./$$test $(TEST_FLAGS) || \
(test $$HDF5_Make_Ignore && echo "*** Error ignored") || \
break; \
echo ""; \