[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
This commit is contained in:
@@ -68,18 +68,18 @@ localdocDATA_INSTALL = $(INSTALL_DATA)
|
||||
DATA = $(localdoc_DATA)
|
||||
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
|
||||
|
||||
# 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
|
||||
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
|
||||
ADD_PARALLEL_FILES = @ADD_PARALLEL_FILES@
|
||||
AMDEP_FALSE = @AMDEP_FALSE@
|
||||
AMDEP_TRUE = @AMDEP_TRUE@
|
||||
AMTAR = @AMTAR@
|
||||
AM_MAKEFLAGS = @AM_MAKEFLAGS@
|
||||
AR = @AR@
|
||||
AUTOCONF = /usr/local/autoconf-2.59/bin/autoconf
|
||||
AUTOHEADER = /usr/local/autoconf-2.59/bin/autoheader
|
||||
AUTOMAKE = /usr/bin/automake
|
||||
AUTOCONF = /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf
|
||||
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
|
||||
AWK = @AWK@
|
||||
BUILD_CXX_CONDITIONAL_FALSE = @BUILD_CXX_CONDITIONAL_FALSE@
|
||||
BUILD_CXX_CONDITIONAL_TRUE = @BUILD_CXX_CONDITIONAL_TRUE@
|
||||
@@ -250,6 +250,15 @@ target_alias = @target_alias@
|
||||
RM = rm -f
|
||||
CP = cp
|
||||
|
||||
# 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
|
||||
|
||||
Reference in New Issue
Block a user