aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Fandrich <dan@coneharvesters.com>2010-09-02 18:38:00 -0700
committerDenys Vlasenko <dvlasenk@redhat.com>2010-09-03 17:09:51 +0200
commiteb2bf5b6bfd04f7e123d7561725b00f807486849 (patch)
treefe88db7e8ac340c4e8e1c9f3f62dee70e49021f5
parent2ab3acb2747f43892641176491b0a0c09f11f086 (diff)
downloadbusybox-eb2bf5b6bfd04f7e123d7561725b00f807486849.tar.gz
Fix some test cases
The tar tests still don't pass, but at least now it's because of a problem with Busybox and not the tests themselves. Signed-off-by: Dan Fandrich <dan@coneharvesters.com> Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
-rwxr-xr-xtestsuite/makedevs.tests5
-rwxr-xr-xtestsuite/printf.tests6
-rwxr-xr-xtestsuite/tar.tests8
3 files changed, 14 insertions, 5 deletions
diff --git a/testsuite/makedevs.tests b/testsuite/makedevs.tests
index eb51410b3..fd12460ec 100755
--- a/testsuite/makedevs.tests
+++ b/testsuite/makedevs.tests
@@ -4,6 +4,11 @@
. ./testing.sh
+test x"`id -u`" = x"0" || {
+ echo "SKIPPED: makedevs (must be root to test this)"
+ exit 0
+}
+
unset LANG
unset LC_COLLATE
unset LC_ALL
diff --git a/testsuite/printf.tests b/testsuite/printf.tests
index b48e293f4..9a3c87473 100755
--- a/testsuite/printf.tests
+++ b/testsuite/printf.tests
@@ -89,9 +89,9 @@ testing "printf understands %Ld" \
testing "printf handles %d bad_input" \
"${bb}printf '%d\n' 1 - 2 bad 3 123bad 4 2>&1; echo \$?" \
-"1\n""printf: -: invalid number\n""0\n"\
-"2\n""printf: bad: invalid number\n""0\n"\
-"3\n""printf: 123bad: invalid number\n""0\n"\
+"1\n""printf: invalid number '-'\n""0\n"\
+"2\n""printf: invalid number 'bad'\n""0\n"\
+"3\n""printf: invalid number '123bad'\n""0\n"\
"4\n""1\n" \
"" ""
diff --git a/testsuite/tar.tests b/testsuite/tar.tests
index cef16b65e..8b2523ff1 100755
--- a/testsuite/tar.tests
+++ b/testsuite/tar.tests
@@ -55,11 +55,13 @@ rm -rf input_* test.tar 2>/dev/null
chmod 741 input_hard1
ln input_hard1 input_hard2
mkdir input_dir
-chmod 550 input_dir
ln input_hard1 input_dir
ln input_hard2 input_dir
+chmod 550 input_dir
tar cf test.tar input_*
tar tvf test.tar | sed "s/.*[0-9] input/input/"
+chmod 770 input_dir
+rm -rf input_*
tar xf test.tar 2>&1
echo Ok: $?
ls -l . input_dir/* | grep input_ | sed "s/\\(^[^ ]*\\) .* input/\\1 input/"
@@ -86,11 +88,13 @@ rm -rf input_* test.tar 2>/dev/null
chmod 741 input_file
ln -s input_file input_soft
mkdir input_dir
-chmod 550 input_dir
ln input_file input_dir
ln input_soft input_dir
+chmod 550 input_dir
tar cf test.tar input_*
tar tvf test.tar | sed "s/.*[0-9] input/input/" | sort
+chmod 770 input_dir
+rm -rf input_*
tar xf test.tar 2>&1
echo Ok: $?
ls -l . input_dir/* | grep input_ | sed "s/\\(^[^ ]*\\) .* input/\\1 input/"