diff options
| -rwxr-xr-x | tests/chgrp.test | 2 | ||||
| -rwxr-xr-x | tests/chown.test | 2 | ||||
| -rwxr-xr-x | tests/cpio.test | 6 | ||||
| -rwxr-xr-x | tests/ifconfig.test | 2 | ||||
| -rwxr-xr-x | tests/losetup.test | 2 | ||||
| -rwxr-xr-x | tests/seq.test | 4 | ||||
| -rwxr-xr-x | tests/useradd.test | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/tests/chgrp.test b/tests/chgrp.test index 2af93857..5a741d9b 100755 --- a/tests/chgrp.test +++ b/tests/chgrp.test @@ -4,7 +4,7 @@ if [ "$(id -u)" -ne 0 ] then - echo "SKIPPED: chgrp (not root)" + echo "$SHOWSKIP: chgrp (not root)" continue 2>/dev/null exit fi diff --git a/tests/chown.test b/tests/chown.test index 40ed7b5f..408d5f34 100755 --- a/tests/chown.test +++ b/tests/chown.test @@ -4,7 +4,7 @@ if [ "$(id -u)" -ne 0 ] then - echo "SKIPPED: chown (not root)" + echo "$SHOWSKIP: chown (not root)" continue 2>/dev/null exit fi diff --git a/tests/cpio.test b/tests/cpio.test index d0528e52..2d91b06d 100755 --- a/tests/cpio.test +++ b/tests/cpio.test @@ -25,10 +25,10 @@ printf '333' >dddd # the relevant bit should be here: # 110*5 + 4*3 + 2 + 6*3 = 550 + 12 + 20 = 582 # files are padded to n*4, names are padded to 2 + n*4 due to the header length -testing "cpio archive length" "cpio -o -H newc|dd ibs=2 skip=291 count=5" "TRAILER!!!" "" "a\nbb\nccc\ndddd\n" -testing "cpio archive magic" "cpio -o -H newc|dd ibs=2 count=3" "070701" "" "a\n" +testing "cpio archive length" "cpio -o -H newc|dd ibs=2 skip=291 count=5 2>/dev/null" "TRAILER!!!" "" "a\nbb\nccc\ndddd\n" +testing "cpio archive magic" "cpio -o -H newc|dd ibs=2 count=3 2>/dev/null" "070701" "" "a\n" # check name length (8 bytes before the empty "crc") -testing "cpio name length" "cpio -o -H newc|dd ibs=2 skip=47 count=4" "00000002" "" "a\n" +testing "cpio name length" "cpio -o -H newc|dd ibs=2 skip=47 count=4 2>/dev/null" "00000002" "" "a\n" rm a bb ccc dddd # archive dangling symlinks and empty files even if we cannot open them diff --git a/tests/ifconfig.test b/tests/ifconfig.test index 0c0af463..c30c74c9 100755 --- a/tests/ifconfig.test +++ b/tests/ifconfig.test @@ -23,7 +23,7 @@ if [ "$(id -u)" -ne 0 ] then - echo "SKIPPED: ifconfig (not root)" + echo "$SHOWSKIP: ifconfig (not root)" continue 2>/dev/null exit fi diff --git a/tests/losetup.test b/tests/losetup.test index fe1e5206..84ac4b1f 100755 --- a/tests/losetup.test +++ b/tests/losetup.test @@ -4,7 +4,7 @@ if [ "$(id -u)" -ne 0 ] then - echo "SKIPPED: losetup (not root)" + echo "$SHOWSKIP: losetup (not root)" continue 2>/dev/null exit fi diff --git a/tests/seq.test b/tests/seq.test index 4d23f8e2..59966172 100755 --- a/tests/seq.test +++ b/tests/seq.test @@ -28,14 +28,14 @@ testing "seq separator and format string" "seq -f \%03g -s \; 5 -1 0" "005;004;0 # Test -f format filtering for i in %f %e %g "boo %f yah" "% f" %-1.2f %+-f "%+ - f" %.2f %3.f "%'.2f" \ - %%%f%% %%%f%%% + %%%f%% do testing "seq filter -f \"$i\"" "seq -f \"$i\" 1 3 > /dev/null && echo yes" \ "yes\n" "" "" done # Test -f format filtering failures for i in %d %s "" "boo %f %f yah" "%*f" %-1.2.3f '%2$f' %1-f "%1 f" \ - %2..2f + %2..2f %%%f%%% do testing "seq filter reject -f '$i'" \ "seq -f '$i' 1 3 2>/dev/null || echo no" "no\n" "" "" diff --git a/tests/useradd.test b/tests/useradd.test index a954e72b..6ffe7071 100755 --- a/tests/useradd.test +++ b/tests/useradd.test @@ -7,7 +7,7 @@ if [ "$(id -u)" -ne 0 ] then - echo "SKIPPED: useradd (not root)" + echo "$SHOWSKIP: useradd (not root)" continue 2>/dev/null exit fi |