diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2021-12-10 05:06:53 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-10 05:06:53 (GMT) |
| commit | 5580d7ec815e506370c4b1d68fc5ed089442e15d (patch) | |
| tree | 5416be32e3251eeb809c1f16781d3e22644536f2 /test/testflushrefresh.sh.in | |
| parent | 364d8cc3e749bcee4486897b6703f9ac7a303225 (diff) | |
| download | hdf5-5580d7ec815e506370c4b1d68fc5ed089442e15d.zip hdf5-5580d7ec815e506370c4b1d68fc5ed089442e15d.tar.gz hdf5-5580d7ec815e506370c4b1d68fc5ed089442e15d.tar.bz2 | |
Fix directory variable in shell scripts (#1273)
* Fix testswmr scripts with utils/test variable
* Change format of configure var assignment
* quote the variable value in configure
* Use sh.in expected var pattern
* Only ref builddir in script
* Create vars for utils/test and test as H5_<path>_BUILDDIR
* Use abs_top_builddir in test scripts
* Change script var to make it easier to read.
* Use @abs_top_builddir@ directly in paths
* Correct typos/comment
Diffstat (limited to 'test/testflushrefresh.sh.in')
| -rw-r--r-- | test/testflushrefresh.sh.in | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/test/testflushrefresh.sh.in b/test/testflushrefresh.sh.in index 3c7f13d..209d370 100644 --- a/test/testflushrefresh.sh.in +++ b/test/testflushrefresh.sh.in @@ -59,27 +59,12 @@ fi ## Main ############################################################################### srcdir=@srcdir@ -bindir=@bindir@ -testdir=@testdir@ - -# 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 +utils_testdir=@abs_top_builddir@/@H5_UTILS_TEST_BUILDDIR@ +testdir=@abs_top_builddir@/@H5_TEST_BUILDDIR@ # 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 @@ -97,7 +82,7 @@ fi # the test. Running each of these tests in its own directory should eliminate # the problem. mkdir -p flushrefresh_test -cp $bindir/flushrefresh flushrefresh_test +cp $testdir/flushrefresh flushrefresh_test # With the --disable-shared option, flushrefresh is built in the test directory, # otherwise it is in test/.libs with a wrapper script named flushrefresh in |