From 2da66c641e296157fd4786a0ea2eef9eda58eb7c Mon Sep 17 00:00:00 2001
From: Milton Woods <miltonjwoods@gmail.com>
Date: Sun, 5 Sep 2021 19:37:08 +1000
Subject: [PATCH] Revert "Replace pwd by $PWDCMD after test_common.sh is
 sourced"

This reverts commit 8665d7f866e67bd96a634bcc4968b9faba8c7d3c.
---
 nc_test/run_diskless2.sh        | 2 +-
 ncdap_test/testauth.sh          | 8 ++++----
 ncdap_test/testbasicauth.sh     | 2 +-
 ncdap_test/testcontainerauth.sh | 2 +-
 ncdump/test_rcmerge.sh          | 8 ++++----
 nczarr_test/run_misc.sh         | 2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/nc_test/run_diskless2.sh b/nc_test/run_diskless2.sh
index e286a5fa80..4c75aae489 100755
--- 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=`$PWDCMD`; fi
+if test "x$srcdir" = x ; then srcdir=`pwd`; fi
 . ../test_common.sh
 
 # Get the target OS and CPU
diff --git a/ncdap_test/testauth.sh b/ncdap_test/testauth.sh
index 7e275fc497..3743b225c0 100755
--- 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=`$PWDCMD`
-cd $srcdir ; abs_srcdir=`$PWDCMD` ; cd $WD
-cd $execdir ; abs_execdir=`$PWDCMD` ; cd $WD
+WD=`pwd`
+cd $srcdir ; abs_srcdir=`pwd` ; cd $WD
+cd $execdir ; abs_execdir=`pwd` ; cd $WD
 
 # Now create a special directory
 # And enter it to execute tests
 rm -fr rcauthdir
 mkdir rcauthdir
 cd rcauthdir
-WD=`$PWDCMD`
+WD=`pwd`
 
 #SHOW=1
 #DBG=1
diff --git a/ncdap_test/testbasicauth.sh b/ncdap_test/testbasicauth.sh
index 2004e469a0..536a22761d 100644
--- a/ncdap_test/testbasicauth.sh
+++ b/ncdap_test/testbasicauth.sh
@@ -21,7 +21,7 @@ RCPREC=1
 
 NFL=1
 
-WD=`$PWDCMD`
+WD=`pwd`
 
 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
index 2b3c8e7f8c..82f26e69c7 100644
--- 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=`$PWDCMD`
+WD=`pwd`
 COOKIES="${WD}/test_auth_cookies"
 
 RC=.daprc
diff --git a/ncdump/test_rcmerge.sh b/ncdump/test_rcmerge.sh
index 642c169d46..3f97bb0b4a 100755
--- 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=`$PWDCMD`
-cd $srcdir ; abs_srcdir=`$PWDCMD` ; cd $WD
-cd $execdir ; abs_execdir=`$PWDCMD` ; cd $WD
+WD=`pwd`
+cd $srcdir ; abs_srcdir=`pwd` ; cd $WD
+cd $execdir ; abs_execdir=`pwd` ; cd $WD
 
 # Now create a special directory
 # And enter it to execute tests
 rm -fr rcmergedir
 mkdir rcmergedir
 cd rcmergedir
-WD=`$PWDCMD`
+WD=`pwd`
 
 if test "x$NCAUTH_HOMETEST" != x ; then
     RCHOME=1
diff --git a/nczarr_test/run_misc.sh b/nczarr_test/run_misc.sh
index 99a8a97a11..1ffb122bfb 100755
--- 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=`$PWDCMD`
+WD=`pwd`
 
 # This shell script provides a miscellaneous set of tests