Merge branch 'busybox' into merge

2 files changed, 3 insertions, 0 deletions

diff --git a/scripts/randomtest b/scripts/randomtest
index 1809838a4..635978338 100755
--- a/scripts/randomtest
+++ b/scripts/randomtest
@@ -52,6 +52,7 @@ echo '# CONFIG_RFKILL is not set' >>.config
 if test x"$LIBC" = x"glibc"; then
         cat .config \
         | grep -v CONFIG_STATIC \
+        | grep -v CONFIG_FEATURE_LIBBUSYBOX_STATIC \
         \
         | grep -v CONFIG_FEATURE_2_4_MODULES \
         | grep -v CONFIG_FEATURE_USE_BSS_TAIL \
@@ -59,6 +60,7 @@ if test x"$LIBC" = x"glibc"; then
         >.config.new
         mv .config.new .config
         echo '# CONFIG_STATIC is not set' >>.config
+        echo '# CONFIG_FEATURE_LIBBUSYBOX_STATIC is not set' >>.config
         # newer glibc (at least 2.23) no longer supply query_module() ABI.
         # People who target 2.4 kernels would likely use older glibc (and older bbox).
         echo '# CONFIG_FEATURE_2_4_MODULES is not set' >>.config
diff --git a/scripts/randomtest.loop b/scripts/randomtest.loop
index 4d14b652f..edfbc5c58 100755
--- a/scripts/randomtest.loop
+++ b/scripts/randomtest.loop
@@ -66,6 +66,7 @@ while sleep 1; do
                         continue
                 fi
         fi
+        grep -i 'warning:' "$dir/make.log"
         rm -rf -- "$dir"
         let cnt++
 done