diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-05-11 12:02:48 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-05-11 12:02:48 +0200 |
| commit | da1382410bbc0dccad0d3936774a9232509f7deb (patch) | |
| tree | e36ded85598000581c9ea24ad9f4140ee07909fd /testsuite | |
| parent | 78d035f7964510cfa8e4b3f5381f40fd2e56437b (diff) | |
| download | busybox-da1382410bbc0dccad0d3936774a9232509f7deb.tar.gz | |
randomtest fixes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'testsuite')
| -rwxr-xr-x | testsuite/mdev.tests | 4 | ||||
| -rwxr-xr-x | testsuite/mount.tests | 3 | ||||
| -rwxr-xr-x | testsuite/tar.tests | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/testsuite/mdev.tests b/testsuite/mdev.tests index 5bd720b9a..c375fc774 100755 --- a/testsuite/mdev.tests +++ b/testsuite/mdev.tests @@ -120,7 +120,7 @@ SKIP= rm -rf mdev.testdir/dev/* # here we complicate things by having non-matching group 1 and using %0 echo "s([0-9])*d([a-z]+) 0:0 644 >sd/%2_%0" >mdev.testdir/etc/mdev.conf -optional STATIC FEATURE_MDEV_CONF FEATURE_MDEV_RENAME FEATURE_MDEV_RENAME_REGEXP FEATURE_LS_RECURSIVE FEATURE_LS_TIMESTAMPS FEATURE_LS_USERNAME +optional STATIC FEATURE_MDEV_CONF FEATURE_MDEV_RENAME FEATURE_MDEV_RENAME_REGEXP FEATURE_LS_RECURSIVE FEATURE_LS_TIMESTAMPS FEATURE_LS_USERNAME FEATURE_LS_SORTFILES testing "mdev regexp substring match + replace" \ "env - PATH=$PATH ACTION=add DEVPATH=/block/sda chroot mdev.testdir /mdev 2>&1; ls -lnR mdev.testdir/dev | $FILTER_LS2" \ @@ -194,7 +194,7 @@ echo "capi 0:0 0660 =capi20" >mdev.testdir/etc/mdev.conf echo "capi([0-9]) 0:0 0660 =capi20.0%1" >>mdev.testdir/etc/mdev.conf echo "capi([0-9]*) 0:0 0660 =capi20.%1" >>mdev.testdir/etc/mdev.conf # mdev invocation with DEVPATH=/class/tty/capi20 was deleting /dev/capi20 -optional STATIC FEATURE_MDEV_CONF FEATURE_MDEV_RENAME FEATURE_MDEV_RENAME_REGEXP FEATURE_LS_RECURSIVE FEATURE_LS_TIMESTAMPS FEATURE_LS_USERNAME +optional STATIC FEATURE_MDEV_CONF FEATURE_MDEV_RENAME FEATURE_MDEV_RENAME_REGEXP FEATURE_LS_RECURSIVE FEATURE_LS_TIMESTAMPS FEATURE_LS_USERNAME FEATURE_LS_SORTFILES testing "move rule does not delete node with name == device_name" \ "\ env - PATH=$PATH ACTION=add DEVPATH=/class/tty/capi chroot mdev.testdir /mdev 2>&1; diff --git a/testsuite/mount.tests b/testsuite/mount.tests index 34988867d..3c7405fbd 100755 --- a/testsuite/mount.tests +++ b/testsuite/mount.tests @@ -14,13 +14,14 @@ 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_MOUNT_FLAGS" != x"y" \ || test x"$CONFIG_FEATURE_DEVFS" = x"y" \ ; then echo "SKIPPED: mount" exit 0 fi -testdir=$PWD/testdir +testdir=$PWD/mount.testdir dd if=/dev/zero of=mount.image1m count=1 bs=1M 2>/dev/null || { echo "dd error"; exit 1; } mkfs.minix -v mount.image1m >/dev/null 2>&1 || { echo "mkfs.minix error"; exit 1; } diff --git a/testsuite/tar.tests b/testsuite/tar.tests index 8599b79fc..d1d4165ca 100755 --- a/testsuite/tar.tests +++ b/testsuite/tar.tests @@ -104,7 +104,7 @@ lrwxrwxrwx input_file "" "" SKIP= -optional FEATURE_TAR_LONG_OPTIONS +optional FEATURE_TAR_CREATE FEATURE_TAR_LONG_OPTIONS testing "tar --overwrite" "\ rm -rf input_* test.tar 2>/dev/null ln input input_hard |