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>
This commit is contained in:
Dan Fandrich 2010-09-02 18:38:00 -07:00 committed by Denys Vlasenko
parent 2ab3acb274
commit eb2bf5b6bf
3 changed files with 14 additions and 5 deletions

View File

@ -4,6 +4,11 @@
. ./testing.sh . ./testing.sh
test x"`id -u`" = x"0" || {
echo "SKIPPED: makedevs (must be root to test this)"
exit 0
}
unset LANG unset LANG
unset LC_COLLATE unset LC_COLLATE
unset LC_ALL unset LC_ALL

View File

@ -89,9 +89,9 @@ testing "printf understands %Ld" \
testing "printf handles %d bad_input" \ testing "printf handles %d bad_input" \
"${bb}printf '%d\n' 1 - 2 bad 3 123bad 4 2>&1; echo \$?" \ "${bb}printf '%d\n' 1 - 2 bad 3 123bad 4 2>&1; echo \$?" \
"1\n""printf: -: invalid number\n""0\n"\ "1\n""printf: invalid number '-'\n""0\n"\
"2\n""printf: bad: invalid number\n""0\n"\ "2\n""printf: invalid number 'bad'\n""0\n"\
"3\n""printf: 123bad: invalid number\n""0\n"\ "3\n""printf: invalid number '123bad'\n""0\n"\
"4\n""1\n" \ "4\n""1\n" \
"" "" "" ""

View File

@ -55,11 +55,13 @@ rm -rf input_* test.tar 2>/dev/null
chmod 741 input_hard1 chmod 741 input_hard1
ln input_hard1 input_hard2 ln input_hard1 input_hard2
mkdir input_dir mkdir input_dir
chmod 550 input_dir
ln input_hard1 input_dir ln input_hard1 input_dir
ln input_hard2 input_dir ln input_hard2 input_dir
chmod 550 input_dir
tar cf test.tar input_* tar cf test.tar input_*
tar tvf test.tar | sed "s/.*[0-9] input/input/" tar tvf test.tar | sed "s/.*[0-9] input/input/"
chmod 770 input_dir
rm -rf input_*
tar xf test.tar 2>&1 tar xf test.tar 2>&1
echo Ok: $? echo Ok: $?
ls -l . input_dir/* | grep input_ | sed "s/\\(^[^ ]*\\) .* input/\\1 input/" 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 chmod 741 input_file
ln -s input_file input_soft ln -s input_file input_soft
mkdir input_dir mkdir input_dir
chmod 550 input_dir
ln input_file input_dir ln input_file input_dir
ln input_soft input_dir ln input_soft input_dir
chmod 550 input_dir
tar cf test.tar input_* tar cf test.tar input_*
tar tvf test.tar | sed "s/.*[0-9] input/input/" | sort tar tvf test.tar | sed "s/.*[0-9] input/input/" | sort
chmod 770 input_dir
rm -rf input_*
tar xf test.tar 2>&1 tar xf test.tar 2>&1
echo Ok: $? echo Ok: $?
ls -l . input_dir/* | grep input_ | sed "s/\\(^[^ ]*\\) .* input/\\1 input/" ls -l . input_dir/* | grep input_ | sed "s/\\(^[^ ]*\\) .* input/\\1 input/"