c0211e907
Denys Vlasenko
2010-05-11
Subject
randomtest fixes
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
testsuite/busybox.tests +2 -2testsuite/cpio.tests +2 -2testsuite/mdev.tests +2 -2testsuite/mount.tests +1 -0
testsuite/busybox.tests+2 -2
| @@ -10,7 +10,7 @@ HELPDUMP=`true | busybox 2>&1 | cat` | |
| # We need to test under calling the binary under other names. | |
| - | optional SHOW_USAGE |
| + | optional FEATURE_VERBOSE_USAGE |
| testing "busybox --help busybox" "true | busybox --help busybox 2>&1 | cat" "$HELPDUMP\n\n" "" "" | |
| SKIP= | |
| @@ -27,7 +27,7 @@ do | |
| testing "$i --help" "$i --help 2>&1" "$HELPDUMP\n\n" "" "" | |
| - | optional SHOW_USAGE CAT |
| + | optional FEATURE_VERBOSE_USAGE CAT |
| testing "" "$i cat" "moo" "" "moo" | |
| testing "$i --help cat" "$i --help cat 2>&1 | grep print" \ | |
| "Concatenate FILEs and print them to stdout\n" "" "" | |
testsuite/cpio.tests+2 -2
| @@ -31,7 +31,7 @@ rm -rf cpio.testdir cpio.testdir2 2>/dev/null | |
| # testing "test name" "command" "expected result" "file input" "stdin" | |
| - | optional FEATURE_LS_SORTFILES |
| + | optional FEATURE_LS_SORTFILES FEATURE_LS_TIMESTAMPS |
| testing "cpio extracts zero-sized hardlinks" \ | |
| "$ECHO -ne '$hexdump' | bzcat | cpio -i 2>&1; echo \$?; | |
| ls -ln cpio.testdir | $FILTER_LS" \ | |
| @@ -71,7 +71,7 @@ ln cpio.testdir/empty cpio.testdir/empty1 | |
| ln cpio.testdir/nonempty cpio.testdir/nonempty1 | |
| mkdir cpio.testdir2 | |
| - | optional FEATURE_CPIO_O LONG_OPTS |
| + | optional FEATURE_CPIO_O LONG_OPTS FEATURE_LS_SORTFILES FEATURE_LS_TIMESTAMPS |
| testing "cpio extracts zero-sized hardlinks 2" \ | |
| "find cpio.testdir | cpio -H newc --create | (cd cpio.testdir2 && cpio -i 2>&1); echo \$?; | |
| ls -ln cpio.testdir2/cpio.testdir | $FILTER_LS" \ | |
testsuite/mdev.tests+2 -2
| @@ -138,7 +138,7 @@ SKIP= | |
| # continuing to use directory structure from prev test | |
| rm -rf mdev.testdir/dev/* | |
| echo "sda 0:0 644 @echo @echo TEST" >mdev.testdir/etc/mdev.conf | |
| - | optional STATIC FEATURE_MDEV_CONF FEATURE_MDEV_EXEC FEATURE_LS_RECURSIVE FEATURE_LS_TIMESTAMPS FEATURE_LS_USERNAME |
| + | optional STATIC FEATURE_MDEV_CONF FEATURE_MDEV_EXEC FEATURE_LS_RECURSIVE FEATURE_LS_TIMESTAMPS FEATURE_LS_USERNAME FEATURE_SH_IS_ASH |
| testing "mdev command" \ | |
| "env - PATH=$PATH ACTION=add DEVPATH=/block/sda chroot mdev.testdir /mdev 2>&1; | |
| ls -lnR mdev.testdir/dev | $FILTER_LS" \ | |
| @@ -153,7 +153,7 @@ SKIP= | |
| # continuing to use directory structure from prev test | |
| rm -rf mdev.testdir/dev/* | |
| echo "sda 0:0 644 =block/ @echo @echo TEST:\$MDEV" >mdev.testdir/etc/mdev.conf | |
| - | optional STATIC FEATURE_MDEV_CONF FEATURE_MDEV_RENAME FEATURE_MDEV_EXEC FEATURE_LS_RECURSIVE FEATURE_LS_TIMESTAMPS FEATURE_LS_USERNAME |
| + | optional STATIC FEATURE_MDEV_CONF FEATURE_MDEV_RENAME FEATURE_MDEV_EXEC FEATURE_LS_RECURSIVE FEATURE_LS_TIMESTAMPS FEATURE_LS_USERNAME FEATURE_SH_IS_ASH |
| testing "mdev move and command" \ | |
| "env - PATH=$PATH ACTION=add DEVPATH=/block/sda chroot mdev.testdir /mdev 2>&1; | |
| ls -lnR mdev.testdir/dev | $FILTER_LS2" \ | |
testsuite/mount.tests+1 -0
| @@ -13,6 +13,7 @@ test "`id -u`" = 0 || { | |
| if test x"$CONFIG_MKFS_MINIX" != x"y" \ | |
| || test x"$CONFIG_FEATURE_MINIX2" != x"y" \ | |
| + | || test x"$CONFIG_FEATURE_MOUNT_LOOP" != x"y" \ |
| || test x"$CONFIG_FEATURE_DEVFS" = x"y" \ | |
| ; then | |
| echo "SKIPPED: mount" | |