Improved portability of tests

Removed assumptions about umask and locale. Fixed hostname
tests to work even when the host has no DNS domain set.

Signed-off-by: Dan Fandrich <dan@coneharvesters.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Dan Fandrich 2010-08-10 23:33:57 -07:00 committed by Denys Vlasenko
parent f03fc7d77a
commit 775965de85
8 changed files with 24 additions and 5 deletions

View File

@ -4,6 +4,8 @@
. ./testing.sh . ./testing.sh
umask 022
# ls -ln shows date. Need to remove that, it's variable. # ls -ln shows date. Need to remove that, it's variable.
# sed: coalesce spaces # sed: coalesce spaces
# cut: remove date # cut: remove date

View File

@ -1,4 +1,7 @@
unset LANG unset LANG
unset LANGUAGE
unset LC_TIME
unset LC_ALL
dt=`busybox date -d 1:2 +%T` dt=`busybox date -d 1:2 +%T`
test x"$dt" = x"01:02:00" test x"$dt" = x"01:02:00"

View File

@ -1,4 +1,6 @@
mkdir du.testdir
cd du.testdir
dd if=/dev/zero of=file1 bs=1k count=64 2>/dev/null dd if=/dev/zero of=file1 bs=1k count=64 2>/dev/null
dd if=/dev/zero of=file2 bs=1k count=16 2>/dev/null dd if=/dev/zero of=file2 bs=1k count=16 2>/dev/null
test x"`busybox du -k .`" = x"80 ." \ test x"`busybox du -k .`" = x"80 ." \
-o x"`busybox du -k .`" = x"88 ." \ -o x"`busybox du -k .`" = x"88 ."

View File

@ -1,8 +1,11 @@
# FEATURE: CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K # FEATURE: CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K
mkdir du.testdir
cd du.testdir
dd if=/dev/zero of=file1 bs=1k count=64 2>/dev/null dd if=/dev/zero of=file1 bs=1k count=64 2>/dev/null
ln file1 file1.1 ln file1 file1.1
dd if=/dev/zero of=file2 bs=1k count=16 2>/dev/null dd if=/dev/zero of=file2 bs=1k count=16 2>/dev/null
test x"`busybox du -l .`" = x"144 ." \ test x"`busybox du -l .`" = x"144 ." \
-o x"`busybox du -l .`" = x"148 ." \ -o x"`busybox du -l .`" = x"148 ." \
-o x"`busybox du -l .`" = x"152 ." \ -o x"`busybox du -l .`" = x"152 ." \
-o x"`busybox du -l .`" = x"156 ."

View File

@ -1,3 +1,3 @@
f=$(busybox hostname -f) f=$(busybox hostname -f).
d=$(busybox hostname -d) d=$(busybox hostname -d)
test x"${f#*.}" = x"$d" test x"${f#*.}" = x"$d${d:+.}"

View File

@ -4,6 +4,10 @@
. ./testing.sh . ./testing.sh
unset LANG
unset LC_COLLATE
unset LC_ALL
# ls -ln is showing date. Need to remove that, it's variable # ls -ln is showing date. Need to remove that, it's variable
# sed: (1) "maj, min" -> "maj,min" (2) coalesce spaces # sed: (1) "maj, min" -> "maj,min" (2) coalesce spaces
# cut: remove date # cut: remove date

View File

@ -4,6 +4,12 @@
. ./testing.sh . ./testing.sh
unset LANG
unset LANGUAGE
unset LC_COLLATE
unset LC_ALL
umask 022
rm -rf tar.tempdir 2>/dev/null rm -rf tar.tempdir 2>/dev/null
mkdir tar.tempdir && cd tar.tempdir || exit 1 mkdir tar.tempdir && cd tar.tempdir || exit 1

View File

@ -13,11 +13,10 @@
# test can create a file "actual" instead of writing to stdout # test can create a file "actual" instead of writing to stdout
# Test setup of standard input # Test setup of standard input
saved_umask=$(umask)
umask 0 umask 0
testing "uuencode sets standard input mode correctly" \ testing "uuencode sets standard input mode correctly" \
"uuencode foo </dev/null | head -n 1 | grep -q 666 && echo yes" "yes\n" "" "" "uuencode foo </dev/null | head -n 1 | grep -q 666 && echo yes" "yes\n" "" ""
umask $saved_umask umask 022
testing "uuencode correct encoding" "uuencode bb_uuenc_test.out" \ testing "uuencode correct encoding" "uuencode bb_uuenc_test.out" \
"begin 644 bb_uuenc_test.out\nM5&AE(&9A<W0@9W)E>2!F;W@@:G5M<&5D(&]V97(@=&AE(&QA>GD@8G)O=VX@\n%9&]G+@H\`\n\`\nend\n" \ "begin 644 bb_uuenc_test.out\nM5&AE(&9A<W0@9W)E>2!F;W@@:G5M<&5D(&]V97(@=&AE(&QA>GD@8G)O=VX@\n%9&]G+@H\`\n\`\nend\n" \