aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2010-07-06 02:26:35 +0200
committerDenys Vlasenko <vda.linux@googlemail.com>2010-07-06 02:26:35 +0200
commit3e5fa43b2faba827e44f184818534b476ec0ed09 (patch)
treeb0d5841adcbdb6e28163fb59bd7eb99247479b92
parentee1f19b9425a8a0d5b9cc5c037b18278df07ee3e (diff)
downloadbusybox-w32-3e5fa43b2faba827e44f184818534b476ec0ed09.tar.gz
busybox-w32-3e5fa43b2faba827e44f184818534b476ec0ed09.tar.bz2
busybox-w32-3e5fa43b2faba827e44f184818534b476ec0ed09.zip
scripts/randomtest: update to pass testsuite with Rob's toolchain
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rwxr-xr-xscripts/randomtest14
1 files changed, 11 insertions, 3 deletions
diff --git a/scripts/randomtest b/scripts/randomtest
index 8d0d79e64..a102593d3 100755
--- a/scripts/randomtest
+++ b/scripts/randomtest
@@ -43,6 +43,10 @@ mv .config.new .config
43echo '# CONFIG_DEBUG_PESSIMIZE is not set' >>.config 43echo '# CONFIG_DEBUG_PESSIMIZE is not set' >>.config
44echo '# CONFIG_WERROR is not set' >>.config 44echo '# CONFIG_WERROR is not set' >>.config
45echo "CONFIG_CROSS_COMPILER_PREFIX=\"${CROSS_COMPILER_PREFIX}\"" >>.config 45echo "CONFIG_CROSS_COMPILER_PREFIX=\"${CROSS_COMPILER_PREFIX}\"" >>.config
46echo '# CONFIG_SELINUX is not set' >>.config
47echo '# CONFIG_EFENCE is not set' >>.config
48echo '# CONFIG_DMALLOC is not set' >>.config
49echo '# CONFIG_RFKILL is not set' >>.config
46 50
47# If glibc, don't build static 51# If glibc, don't build static
48if test x"$LIBC" = x"glibc"; then 52if test x"$LIBC" = x"glibc"; then
@@ -53,18 +57,21 @@ if test x"$LIBC" = x"glibc"; then
53 echo '# CONFIG_STATIC is not set' >>.config 57 echo '# CONFIG_STATIC is not set' >>.config
54fi 58fi
55 59
56# If glibc, build static, and remove some things 60# If uclibc, build static, and remove some things
57# likely to not work on uclibc. 61# likely to not work on uclibc.
58if test x"$LIBC" = x"uclibc"; then 62if test x"$LIBC" = x"uclibc"; then
59 cat .config \ 63 cat .config \
60 | grep -v CONFIG_STATIC \ 64 | grep -v CONFIG_STATIC \
61 | grep -v CONFIG_BUILD_LIBBUSYBOX \ 65 | grep -v CONFIG_BUILD_LIBBUSYBOX \
62 | grep -v CONFIG_TASKSET \
63 | grep -v CONFIG_UNICODE_SUPPORT \
64 | grep -v CONFIG_PIE \ 66 | grep -v CONFIG_PIE \
67 \
68 | grep -v CONFIG_FEATURE_2_4_MODULES \
65 >.config.new 69 >.config.new
66 mv .config.new .config 70 mv .config.new .config
67 echo 'CONFIG_STATIC=y' >>.config 71 echo 'CONFIG_STATIC=y' >>.config
72 echo '# CONFIG_BUILD_LIBBUSYBOX is not set' >>.config
73 echo '# CONFIG_PIE is not set' >>.config
74 echo '# CONFIG_FEATURE_2_4_MODULES is not set' >>.config
68fi 75fi
69 76
70# If STATIC, remove some things. 77# If STATIC, remove some things.
@@ -75,6 +82,7 @@ if grep -q "^CONFIG_STATIC=y" .config; then
75 | grep -v CONFIG_PAM \ 82 | grep -v CONFIG_PAM \
76 >.config.new 83 >.config.new
77 mv .config.new .config 84 mv .config.new .config
85 echo '# CONFIG_PAM is not set' >>.config
78fi 86fi
79 87
80# Regenerate .config with default answers for yanked-off options 88# Regenerate .config with default answers for yanked-off options