Merge branch 'busybox' into merge

2 files changed, 8 insertions, 5 deletions

diff --git a/scripts/randomtest b/scripts/randomtest
index 76550d267..f6e0c9d8c 100755
--- a/scripts/randomtest
+++ b/scripts/randomtest
@@ -83,7 +83,6 @@ if test x"$LIBC" = x"uclibc"; then
         \
         | grep -v CONFIG_FEATURE_2_4_MODULES \
         | grep -v CONFIG_FEATURE_SYNC_FANCY \
-        | grep -v CONFIG_FEATURE_TOUCH_NODEREF \
         | grep -v CONFIG_NANDWRITE \
         | grep -v CONFIG_NANDDUMP \
         | grep -v CONFIG_BLKDISCARD \
@@ -100,7 +99,6 @@ if test x"$LIBC" = x"uclibc"; then
         echo '# CONFIG_PIE is not set' >>.config
         echo '# CONFIG_FEATURE_2_4_MODULES is not set' >>.config
         echo '# CONFIG_FEATURE_SYNC_FANCY is not set' >>.config
-        echo '# CONFIG_FEATURE_TOUCH_NODEREF is not set' >>.config
         # My uclibc installation does not support some needed APIs...
         echo '# CONFIG_NANDWRITE is not set' >>.config
         echo '# CONFIG_NANDDUMP is not set' >>.config
diff --git a/scripts/randomtest.loop b/scripts/randomtest.loop
index edfbc5c58..c6d2cdcda 100755
--- a/scripts/randomtest.loop
+++ b/scripts/randomtest.loop
@@ -6,13 +6,18 @@ run_testsuite=true
 run_single_test=false
 run_single_test=true
 
-test -d "$1" || { echo "'$1' is not a directory"; exit 1; }
-test -x "$1/scripts/randomtest" || { echo "No scripts/randomtest in '$1'"; exit 1; }
-
 export LIBC="uclibc"
 export CROSS_COMPILER_PREFIX="i686-"
 export MAKEOPTS="-j9"
 
+test -d "$1" || { echo "'$1' is not a directory"; exit 1; }
+test -x "$1/scripts/randomtest" || { echo "No scripts/randomtest in '$1'"; exit 1; }
+
+test "$SKIP_MOUNT_MAND_TESTS" = "1" || {
+        echo "SKIP_MOUNT_MAND_TESTS not set, some mount tests will fail"
+        echo "if current kernel has CONFIG_MANDATORY_FILE_LOCKING off."
+}
+
 cnt=0
 fail=0
 while sleep 1; do