randomtest fixes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/testsuite/mdev.tests b/testsuite/mdev.tests
index 5bd720b9a6fbbc10129981e1862c71f1d5bc3ef5..c375fc7748dcc1049ef82146b170e2038a477dce 100755 (executable)
--- 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 34988867da704e68ef050d4923bd1684090b9cca..3c7405fbd531525a0f5e40831894366d0f56dd9c 100755 (executable)
--- 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 8599b79fcfe8174cdf9d3e5c3ab82f9709a93567..d1d4165ca0e8aa038b9d64c5bb0399f058121de4 100755 (executable)
--- 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