More tweaks to rmdir.test and the testing infrastructure.

2 files changed, 10 insertions, 4 deletions

diff --git a/scripts/test.sh b/scripts/test.sh
index 8a080dbf..d532aabe 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -5,7 +5,7 @@
 rm -rf testdir
 mkdir -p testdir
 
-if [ -z "$OLD" ]
+if [ -z "$TEST_HOST" ]
 then
   make install_flat PREFIX=testdir || exit 1
 fi
@@ -26,7 +26,7 @@ else
   for i in "$TOPDIR"/scripts/test/*.test
   do
     CMDNAME="$(echo "$i" | sed 's@.*/\(.*\)\.test@\1@')"
-    if [ -h $CMDNAME ]
+    if [ -h $CMDNAME ] || [ ! -z "$TEST_HOST" ]
     then
       . $i
     else
diff --git a/scripts/test/rmdir.test b/scripts/test/rmdir.test
index 9ca7d59e..bea75881 100755
--- a/scripts/test/rmdir.test
+++ b/scripts/test/rmdir.test
@@ -5,7 +5,7 @@
 #testing "name" "command" "result" "infile" "stdin"
 
 mkdir one
-testing "rmdir" "rmdir one && [ ! -d walrus ] && echo yes" "yes\n" "" ""
+testing "rmdir" "rmdir one && [ ! -d one ] && echo yes" "yes\n" "" ""
 
 touch walrus
 testing "rmdir file" \
@@ -20,6 +20,7 @@ mkdir one two three
 testing "rmdir one missing two file three" \
 	"rmdir one missing two walrus three 2> /dev/null || [ ! -d three ] && echo yes" \
 	"yes\n" "" ""
+rm walrus
 
 mkdir one
 chmod 000 one
@@ -39,7 +40,12 @@ testing "rmdir -p part of path" \
 	"yes\n" "" ""
 rm -rf temp
 
+
 mkdir -p one/two/three
 testing "rmdir -p one/two/three" \
 	"rmdir -p one/two/three && [ ! -e one ] && echo yes" "yes\n" "" ""
-rm walrus
+
+#mkdir -p one/two/three
+#chmod 000 one/two/three one/two one
+#testing "rmdir -p one/two/three" \
+#	"rmdir -p one/two/three && [ ! -e one ] && echo yes" "yes\n" "" ""