aboutsummaryrefslogtreecommitdiff
path: root/scripts/test
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2013-01-05 00:44:24 -0600
committerRob Landley <rob@landley.net>2013-01-05 00:44:24 -0600
commit41ed9793498916c63d375326ea8c9b3fa1479dd6 (patch)
tree85cbe885f586ac1c0402b3bf3b3b3e7f7afa618b /scripts/test
parent90e8605ea587c4ebd00de77e3c71551b6e26b7c0 (diff)
downloadtoybox-41ed9793498916c63d375326ea8c9b3fa1479dd6.tar.gz
Use basename() where appropriate.
Diffstat (limited to 'scripts/test')
-rwxr-xr-xscripts/test/chgrp.test2
-rwxr-xr-xscripts/test/rmdir.test4
-rw-r--r--scripts/test/testing.sh2
3 files changed, 5 insertions, 3 deletions
diff --git a/scripts/test/chgrp.test b/scripts/test/chgrp.test
index 9c7142a4..2af93857 100755
--- a/scripts/test/chgrp.test
+++ b/scripts/test/chgrp.test
@@ -2,8 +2,6 @@
[ -f testing.sh ] && . testing.sh
-VERBOSE=1
-
if [ "$(id -u)" -ne 0 ]
then
echo "SKIPPED: chgrp (not root)"
diff --git a/scripts/test/rmdir.test b/scripts/test/rmdir.test
index bea75881..a7b027e0 100755
--- a/scripts/test/rmdir.test
+++ b/scripts/test/rmdir.test
@@ -45,6 +45,10 @@ mkdir -p one/two/three
testing "rmdir -p one/two/three" \
"rmdir -p one/two/three && [ ! -e one ] && echo yes" "yes\n" "" ""
+mkdir -p one/two/three
+testing "rmdir -p one/two/three/" \
+ "rmdir -p one/two/three/ && [ ! -e one ] && echo yes" "yes\n" "" ""
+
#mkdir -p one/two/three
#chmod 000 one/two/three one/two one
#testing "rmdir -p one/two/three" \
diff --git a/scripts/test/testing.sh b/scripts/test/testing.sh
index 0f72bce4..b7eacc68 100644
--- a/scripts/test/testing.sh
+++ b/scripts/test/testing.sh
@@ -74,7 +74,7 @@ testing ()
echo -ne "$5" | eval "$2" > actual
RETVAL=$?
- cmp expected actual > /dev/null
+ cmp expected actual > /dev/null 2>&1
if [ $? -ne 0 ]
then
FAILCOUNT=$[$FAILCOUNT+1]