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

1 files changed, 8 insertions, 28 deletions

diff --git a/test/testvdsswmr.pwsh.in b/test/testvdsswmr.pwsh.in
index 4e06649..bf5aabb 100644
--- a/test/testvdsswmr.pwsh.in
+++ b/test/testvdsswmr.pwsh.in
@@ -9,13 +9,10 @@
 # help@hdfgroup.org.
 #
 # Tests for the swmr feature using virtual datasets.
-#
-# Created:
-#   Dana Robinson, November 2015
 
 $srcdir  = '@srcdir@'
-$bindir  = '@bindir@'
-$testdir = '@testdir@'
+$utils_testdir=@H5_UTILS_TEST_BUILDDIR@
+$testdir=@H5_TEST_BUILDDIR@
 
 ###############################################################################
 ## test parameters
@@ -29,9 +26,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"
 
 # Print a line-line message left justified in a field of 70 characters
 # beginning with the word "Testing".
@@ -82,27 +79,10 @@ function Wait-Message {
 ###############################################################################
 ## Main
 ###############################################################################
-# The build (current) directory might be different than the source directory.
-if (![System.IO.Directory]::Exists($srcdir)) {
-   $srcdir = Get-Location
-   Write-Output "Setting srcdir to default: $srcdir"
-}
-
-# If the bindir directory is not set just use current (.).
-if (![System.IO.Directory]::Exists($bindir)) {
-   $bindir = Get-Location
-   Write-Output "Setting bindir to default: $bindir"
-}
-
-# If the testdir directory is not set just use current (.).
-if (![System.IO.Directory]::Exists($testdir)) {
-   $testdir = Get-Location
-   Write-Output "Setting testdir to default: $testdir"
-}
 
 # Check to see if the VFD specified by the HDF5_DRIVER environment variable
 # supports SWMR.
-$testprog = Join-Path -Path $bindir -ChildPath swmr_check_compat_vfd.exe
+$testprog = Join-Path -Path $utils_testdir -ChildPath swmr_check_compat_vfd.exe
 $rp = Start-Process -FilePath $testprog -PassThru -Wait -NoNewWindow
 if ($rp.ExitCode -ne 0) {
     Write-Output ""
@@ -124,7 +104,7 @@ Write-Output "##################################################################
 
 # Launch the file generator
 Write-Output "launch the swmr_generator"
-$rp = Start-Process -FilePath $bindir/vds_swmr_gen.exe -NoNewWindow -PassThru -Wait
+$rp = Start-Process -FilePath $testdir/vds_swmr_gen.exe -NoNewWindow -PassThru -Wait
 if ($rp.ExitCode -ne 0) {
     Write-Warning "generator had error"
     $nerrors += 1
@@ -142,7 +122,7 @@ Write-Output "launch the $Nwriters SWMR VDS writers (1 per source)"
 $pid_writers = @()
 $n = 0
 while ($n -lt $Nwriters) {
-    $rp = Start-Process -FilePath $bindir/vds_swmr_writer.exe -NoNewWindow -PassThru -ArgumentList "$n" 2>&1 | tee swmr_writer.out.$n
+    $rp = Start-Process -FilePath $testdir/vds_swmr_writer.exe -NoNewWindow -PassThru -ArgumentList "$n" 2>&1 | tee swmr_writer.out.$n
     $pid_writers +=  $rp.id
     $n += 1
 }
@@ -156,7 +136,7 @@ Write-Output "launch $Nreaders SWMR readers"
 $pid_readers = @()
 $n = 0
 while ($n -lt $Nreaders) {
-    $rp = Start-Process -FilePath $bindir/vds_swmr_reader.exe -NoNewWindow -PassThru 2>&1 | tee swmr_reader.out.$n
+    $rp = Start-Process -FilePath $testdir/vds_swmr_reader.exe -NoNewWindow -PassThru 2>&1 | tee swmr_reader.out.$n
     $pid_readers +=  $rp.id
     $n += 1
 }