randomconfig testsuite fixes

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

1 files changed, 14 insertions, 0 deletions

diff --git a/testsuite/mdev.tests b/testsuite/mdev.tests
index 036738e52..a21d9bd0c 100755
--- a/testsuite/mdev.tests
+++ b/testsuite/mdev.tests
@@ -75,6 +75,7 @@ br--r--r-- 1 2 2 8,0 sda
 # continuing to use directory structure from prev test
 rm -rf mdev.testdir/dev/*
 echo "sda 0:0 444 >disk/scsiA" >mdev.testdir/etc/mdev.conf
+optional FEATURE_LS_RECURSIVE
 testing "mdev move/symlink rule '>bar/baz'" \
 	"env - PATH=$PATH ACTION=add DEVPATH=/block/sda chroot mdev.testdir /mdev 2>&1;
 	ls -lnR mdev.testdir/dev | $FILTER_LS2" \
@@ -87,10 +88,12 @@ mdev.testdir/dev/disk:
 br--r--r-- 1 0 0 scsiA
 " \
 	"" ""
+SKIP=
 
 # continuing to use directory structure from prev test
 rm -rf mdev.testdir/dev/*
 echo "sda 0:0 444 >disk/" >mdev.testdir/etc/mdev.conf
+optional FEATURE_LS_RECURSIVE
 testing "mdev move/symlink rule '>bar/'" \
 	"env - PATH=$PATH ACTION=add DEVPATH=/block/sda chroot mdev.testdir /mdev 2>&1;
 	ls -lnR mdev.testdir/dev | $FILTER_LS2" \
@@ -103,11 +106,13 @@ mdev.testdir/dev/disk:
 br--r--r-- 1 0 0 sda
 " \
 	"" ""
+SKIP=
 
 # continuing to use directory structure from prev test
 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 FEATURE_LS_RECURSIVE
 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" \
@@ -120,10 +125,12 @@ mdev.testdir/dev/sd:
 brw-r--r-- 1 0 0 a_sda
 " \
 	"" ""
+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 FEATURE_LS_RECURSIVE
 testing "mdev command" \
 	"env - PATH=$PATH ACTION=add DEVPATH=/block/sda chroot mdev.testdir /mdev 2>&1;
 	ls -lnR mdev.testdir/dev | $FILTER_LS" \
@@ -133,10 +140,12 @@ mdev.testdir/dev:
 brw-r--r-- 1 0 0 8,0 sda
 " \
 	"" ""
+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 FEATURE_LS_RECURSIVE
 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" \
@@ -149,10 +158,12 @@ mdev.testdir/dev/block:
 brw-r--r-- 1 0 0 sda
 " \
 	"" ""
+SKIP=
 
 # continuing to use directory structure from prev test
 rm -rf mdev.testdir/dev/*
 echo "@8,0 0:1 644" >mdev.testdir/etc/mdev.conf
+optional FEATURE_LS_RECURSIVE
 testing "mdev #maj,min and no explicit uid" \
 	"env - PATH=$PATH ACTION=add DEVPATH=/block/sda chroot mdev.testdir /mdev 2>&1;
 	ls -lnR mdev.testdir/dev | $FILTER_LS" \
@@ -161,6 +172,7 @@ mdev.testdir/dev:
 brw-r--r-- 1 0 1 8,0 sda
 " \
 	"" ""
+SKIP=
 
 # continuing to use directory structure from prev test
 rm -rf mdev.testdir/dev/*
@@ -174,6 +186,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 FEATURE_LS_RECURSIVE
 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;
@@ -187,6 +200,7 @@ crw-rw---- 1 0 0 191,1 capi20.01
 crw-rw---- 1 0 0 191,20 capi20.20
 " \
 	"" ""
+SKIP=
 
 # clean up
 rm -rf mdev.testdir