diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2021-12-11 02:19:04 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-11 02:19:04 (GMT) |
| commit | 290b52f1b840e4945cf12508bd4832c5750695d8 (patch) | |
| tree | e05a7f47180d69c75bdd3e572e7469d8b6335693 /test/testvdsswmr.sh.in | |
| parent | 206e1dacfe4094b47c2a9e74982450a308fd08c5 (diff) | |
| download | hdf5-290b52f1b840e4945cf12508bd4832c5750695d8.zip hdf5-290b52f1b840e4945cf12508bd4832c5750695d8.tar.gz hdf5-290b52f1b840e4945cf12508bd4832c5750695d8.tar.bz2 | |
Merge Fix directory variable in shell scripts #1273 (#1278)
Diffstat (limited to 'test/testvdsswmr.sh.in')
| -rw-r--r-- | test/testvdsswmr.sh.in | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/test/testvdsswmr.sh.in b/test/testvdsswmr.sh.in index c57cc08..399fdef 100644 --- a/test/testvdsswmr.sh.in +++ b/test/testvdsswmr.sh.in @@ -17,8 +17,8 @@ # Dana Robinson, November 2015 srcdir=@srcdir@ -bindir=@bindir@ -testdir=@testdir@ +utils_testdir=@abs_top_builddir@/@H5_UTILS_TEST_BUILDDIR@ +testdir=@abs_top_builddir@/@H5_TEST_BUILDDIR@ ############################################################################### ## test parameters @@ -32,9 +32,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 "$bindir/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 @@ -80,24 +80,10 @@ WAIT_MESSAGE() { ############################################################################### ## Main ############################################################################### -# 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 @@ -166,7 +152,7 @@ if test $? -ne 0; then nerrors=`expr $nerrors + 1` fi -# Check for error and exit if one occured +# Check for error and exit if one occurred $DPRINT nerrors=$nerrors if test $nerrors -ne 0 ; then echo "VDS SWMR tests failed with $nerrors errors." @@ -221,7 +207,7 @@ for xpid in $pid_readers; do fi done -# Check for error and exit if one occured +# Check for error and exit if one occurred $DPRINT nerrors=$nerrors if test $nerrors -ne 0 ; then echo "VDS SWMR tests failed with $nerrors errors." |