Less /bin/-hardcoded paths

diff --git a/t/apenwarr/105-sympath/all.do b/t/apenwarr/105-sympath/all.do
index 7def58dd891c8db5c53a84032713df2a2ff55e6f..bb8a16a196ca6ee5a22197cd543e4fa2eaea10d1 100644 (file)
--- a/t/apenwarr/105-sympath/all.do
+++ b/t/apenwarr/105-sympath/all.do
@@ -11,12 +11,13 @@ for iter in 10 20; do
        (
                cd y/x/x/x/x/x
                IFS=$(printf '\n')
+               _pwd=$(env pwd)
                redo-ifchange static x/x/x/static $PWD/static \
-                       $(/bin/pwd)/static /etc/passwd
+                       $_pwd/static /etc/passwd
                # goredo: that symlink path is not resolving even at OS level
                # redo-ifchange $PWD/../static 2>/dev/null && exit 35
                redo-ifchange 1.dyn x/x/x/2.dyn $PWD/3.dyn \
-                        $PWD/../4.dyn $(/bin/pwd)/5.dyn
+                        $PWD/../4.dyn $_pwd/5.dyn
        )
        [ -e y/1.dyn ] || exit $((iter + 1))
        [ -e y/2.dyn ] || exit $((iter + 2))

diff --git a/t/apenwarr/all.do b/t/apenwarr/all.do
index 362d319a771e4cb15247c6272f53f1c4283795bc..06a9d54d872837c296f423ba099dd0835cb2e854 100644 (file)
--- a/t/apenwarr/all.do
+++ b/t/apenwarr/all.do
@@ -5,5 +5,5 @@ if [ "$(cat 000-set-minus-e/log)" != "ok" ]; then
     exit 5
 fi
 
-/bin/ls 1[0-9][0-9]*/all.do | sed 's/\.do$//' | xargs redo
+env ls 1[0-9][0-9]*/all.do | sed 's/\.do$//' | xargs redo
 110-compile/hello >&2

diff --git a/t/apenwarr/clean.do b/t/apenwarr/clean.do
index ee6ed2b64bcd5463bc0b1b45db7abe3e3f21b2f9..ecc7e74278615299637e9b86ad0873f84e492f5e 100644 (file)
--- a/t/apenwarr/clean.do
+++ b/t/apenwarr/clean.do
@@ -1,3 +1 @@
-/bin/ls [0-9s][0-9][0-9]*/clean.do |
-sed 's/\.do$//' |
-xargs redo
+env ls [0-9s][0-9][0-9]*/clean.do | sed 's/\.do$//' | xargs redo