Replace pwd by $PWDCMD after test_common.sh is sourced

mjwoods · Sep 4, 2021 · 8665d7f · 8665d7f
1 parent c1bddec
commit 8665d7f
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/nc_test/run_diskless2.sh b/nc_test/run_diskless2.sh
@@ -5,7 +5,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 
 set -e
 
-if test "x$srcdir" = x ; then srcdir=`pwd`; fi
+if test "x$srcdir" = x ; then srcdir=`$PWDCMD`; fi
 . ../test_common.sh
 
 # Get the target OS and CPU

diff --git a/ncdap_test/testauth.sh b/ncdap_test/testauth.sh
@@ -7,16 +7,16 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 # we need to isolate from any other test.
 
 # Make sure execdir and srcdir absolute paths are available
-WD=`pwd`
-cd $srcdir ; abs_srcdir=`pwd` ; cd $WD
-cd $execdir ; abs_execdir=`pwd` ; cd $WD
+WD=`$PWDCMD`
+cd $srcdir ; abs_srcdir=`$PWDCMD` ; cd $WD
+cd $execdir ; abs_execdir=`$PWDCMD` ; cd $WD
 
 # Now create a special directory
 # And enter it to execute tests
 rm -fr rcauthdir
 mkdir rcauthdir
 cd rcauthdir
-WD=`pwd`
+WD=`$PWDCMD`
 
 #SHOW=1
 #DBG=1

diff --git a/ncdap_test/testbasicauth.sh b/ncdap_test/testbasicauth.sh
@@ -21,7 +21,7 @@ RCPREC=1
 
 NFL=1
 
-WD=`pwd`
+WD=`$PWDCMD`
 
 NETRCFILE=$WD/test_auth_netrc
 # This is the control variable; set when needed

diff --git a/ncdap_test/testcontainerauth.sh b/ncdap_test/testcontainerauth.sh
@@ -9,7 +9,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 #GDB=1
 #VG=1
 
-WD=`pwd`
+WD=`$PWDCMD`
 COOKIES="${WD}/test_auth_cookies"
 
 RC=.daprc

diff --git a/ncdump/test_rcmerge.sh b/ncdump/test_rcmerge.sh
@@ -20,16 +20,16 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 # we need to isolate from any other test.
 
 # Make sure execdir and srcdir absolute paths are available
-WD=`pwd`
-cd $srcdir ; abs_srcdir=`pwd` ; cd $WD
-cd $execdir ; abs_execdir=`pwd` ; cd $WD
+WD=`$PWDCMD`
+cd $srcdir ; abs_srcdir=`$PWDCMD` ; cd $WD
+cd $execdir ; abs_execdir=`$PWDCMD` ; cd $WD
 
 # Now create a special directory
 # And enter it to execute tests
 rm -fr rcmergedir
 mkdir rcmergedir
 cd rcmergedir
-WD=`pwd`
+WD=`$PWDCMD`
 
 if test "x$NCAUTH_HOMETEST" != x ; then
     RCHOME=1

diff --git a/nczarr_test/run_misc.sh b/nczarr_test/run_misc.sh
@@ -11,7 +11,7 @@ if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 rm -fr rcmiscdir
 mkdir rcmiscdir
 cd rcmiscdir
-WD=`pwd`
+WD=`$PWDCMD`
 
 # This shell script provides a miscellaneous set of tests