ash: do not let EXIT trap to fire in `trap`

[oweals/busybox.git] / scripts / randomtest

diff --git a/scripts/randomtest b/scripts/randomtest
index d9d3959bec32c26e835af1cb1617b17fcd1918b6..bd5ef4bfee86e94b2190b9571b21e6cb77d8e1e1 100755 (executable)
--- a/scripts/randomtest
+++ b/scripts/randomtest
@@ -35,6 +35,10 @@ cat .config \
 | grep -v ^CONFIG_SELINUX= \
 | grep -v ^CONFIG_EFENCE= \
 | grep -v ^CONFIG_DMALLOC= \
+| grep -v ^CONFIG_ACPID= \
+| grep -v ^CONFIG_FLASH_ERASEALL= \
+| grep -v ^CONFIG_FLASH_LOCK= \
+| grep -v ^CONFIG_FLASH_UNLOCK= \
 | cat >.config.new
 mv .config.new .config
 }
@@ -76,21 +80,10 @@ cat .config \
 mv .config.new .config
 }
 
-# CONFIG_NOMMU + CONFIG_HUSH + CONFIG_WERROR don't mix
-# (produces warning)
-grep -q ^CONFIG_NOMMU= .config && \
-grep -q ^CONFIG_HUSH= .config && \
-{
-cat .config \
-| grep -v ^CONFIG_WERROR= \
-| cat >.config.new
-mv .config.new .config
-}
-
 # Regenerate .config with default answers for yanked-off options
 { yes "" | make oldconfig >/dev/null; } || exit 1
 
-nice -n 10 make
+nice -n 10 make 2>&1 | tee -a make.log
 
 test -x busybox && {
     cd ..
@@ -99,5 +92,5 @@ test -x busybox && {
 }
 
 cd ..
-mv "$dir" failed."$dir"
+mv "$dir" "failed.$dir"
 exit 1