summaryrefslogtreecommitdiffstats
path: root/test/testswmr.sh.in
diff options
context:
space:
mode:
Diffstat (limited to 'test/testswmr.sh.in')
-rw-r--r--test/testswmr.sh.in24
1 files changed, 5 insertions, 19 deletions
diff --git a/test/testswmr.sh.in b/test/testswmr.sh.in
index 65bf821..771fe4a 100644
--- a/test/testswmr.sh.in
+++ b/test/testswmr.sh.in
@@ -17,8 +17,8 @@
# Albert Cheng, 2009/07/22
srcdir=@srcdir@
-bindir=@bindir@
-testdir=@testdir@
+utils_testdir=@abs_top_builddir@/@H5_UTILS_TEST_BUILDDIR@
+testdir=@abs_top_builddir@/@H5_TEST_BUILDDIR@
###############################################################################
## test parameters
@@ -38,9 +38,9 @@ nerrors=0
## definitions for message file to coordinate test runs
###############################################################################
WRITER_MESSAGE=SWMR_WRITER_MESSAGE # The message file created by writer that the open is complete
- # This should be the same as the define in "./swmr_common.h"
+ # This should be the same as the define in "test/swmr_common.h"
MESSAGE_TIMEOUT=300 # Message timeout length in secs
- # This should be the same as the define in "./h5test.h"
+ # This should be the same as the define in "test/h5test.h"
###############################################################################
## short hands and function definitions
@@ -94,24 +94,10 @@ WAIT_MESSAGE() {
## to proceed as expected.
##
###############################################################################
-# The build (current) directory might be different than the source directory.
-if test -z "$srcdir"; then
- srcdir=.
-fi
-
-# If the bindir directory is not set just use current (.).
-if test -z "$bindir"; then
- bindir=.
-fi
-
-# If the testdir directory is not set just use current (.).
-if test -z "$testdir"; then
- testdir=.
-fi
# Check to see if the VFD specified by the HDF5_DRIVER environment variable
# supports SWMR.
-$bindir/swmr_check_compat_vfd
+$utils_testdir/swmr_check_compat_vfd
rc=$?
if [ $rc -ne 0 ] ; then
echo