3 files changed, 23 insertions, 9 deletions
diff --git a/testsuite/bzcat.tests b/testsuite/bzcat.tests
index 9a1c284..2b38472 100755
--- a/testsuite/bzcat.tests
+++ b/testsuite/bzcat.tests
@@ -28,7 +28,10 @@ hello_bz2() {
     $ECHO -ne "\x17\x72\x45\x38\x50\x90\x5b\xb8\xe8\xa3"
 }
 
-for ext in gz bz2 Z
+for ext in \
+    `test x"$CONFIG_GUNZIP=y = x"y" && echo gz` \
+    `test x"$CONFIG_BUNZIP2=y = x"y" && echo bz2` \
+    `test x"$CONFIG_UNCOMPRESS" = x"y" && echo Z`
 do
     prep() {
 	rm -f t1.$ext t2.$ext t_actual
@@ -49,11 +52,12 @@ do
     mkdir testdir 2>/dev/null
     (
     cd testdir || { echo "cannot cd testdir!"; exit 1; }
-
     expected="HELLO\nok\n"
-    prep; check "zcat: dont delete $ext src" "${bb}zcat t2.$ext; test -f t2.$ext && echo ok"
-
+    prep
+    check "zcat: dont delete $ext src" "${bb}zcat t2.$ext; test -f t2.$ext && echo ok"
+    exit $FAILCOUNT
     )
+    FAILCOUNT=$?
     rm -rf testdir
 done
 
@@ -89,6 +93,7 @@ testing "bzcat can handle compressed zero-length bzip2 files" \
 ## compress algorithm
 
 # "input" file is compressed (.Z) file with "a\n" data
+test x"$CONFIG_UNCOMPRESS" = x"y" && \
 testing "zcat can print many files" \
 "$ECHO -ne '$hexdump' | zcat input input; echo \$?" \
 "\
@@ -100,7 +105,8 @@ a
 " ""
 
 # "input" file is compressed (.Z) zero byte file
-testing "zcat can handle compressed zero-length compressed (.Z) files" \
+test x"$CONFIG_UNCOMPRESS" = x"y" && \
+testing "zcat can handle compressed zero-length (.Z) files" \
 "$ECHO -ne '$hexdump' | zcat input input; echo \$?" \
 "0\n" \
 "\x1f\x9d\x90\x00" ""
diff --git a/testsuite/pwd/pwd-prints-working-directory b/testsuite/pwd/pwd-prints-working-directory
index 8575347..971adb5 100644
--- a/testsuite/pwd/pwd-prints-working-directory
+++ b/testsuite/pwd/pwd-prints-working-directory
@@ -1 +1,4 @@
-test $(pwd) = $(busybox pwd)
+# shell's $PWD may leave symlinks unresolved.
+# "pwd" may be a built-in and have the same problem.
+# External pwd _can't_ have that problem (current dir on Unix is physical).
+test $(`which pwd`) = $(busybox pwd)
diff --git a/testsuite/readlink.tests b/testsuite/readlink.tests
index c7fc8ad..e9d8da0 100755
--- a/testsuite/readlink.tests
+++ b/testsuite/readlink.tests
@@ -21,10 +21,15 @@ testing "readlink on a link" "readlink ./$TESTLINK" "./$TESTFILE\n" "" ""
 
 optional FEATURE_READLINK_FOLLOW
 
-testing "readlink -f on a file" "readlink -f ./$TESTFILE" "$PWD/$TESTFILE\n" "" ""
-testing "readlink -f on a link" "readlink -f ./$TESTLINK" "$PWD/$TESTFILE\n" "" ""
+# shell's $PWD may leave symlinks unresolved.
+# "pwd" may be a built-in and have the same problem.
+# External pwd _can't_ have that problem (current dir on Unix is physical).
+pwd=`which pwd`
+pwd=`$pwd`
+testing "readlink -f on a file" "readlink -f ./$TESTFILE" "$pwd/$TESTFILE\n" "" ""
+testing "readlink -f on a link" "readlink -f ./$TESTLINK" "$pwd/$TESTFILE\n" "" ""
 testing "readlink -f on an invalid link" "readlink -f ./$FAILLINK" "" "" ""
-testing "readlink -f on a wierd dir" "readlink -f $TESTDIR/../$TESTFILE" "$PWD/$TESTFILE\n" "" ""
+testing "readlink -f on a wierd dir" "readlink -f $TESTDIR/../$TESTFILE" "$pwd/$TESTFILE\n" "" ""
 
 
 # clean up