summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko2016-06-19 21:54:04 +0200
committerDenys Vlasenko2016-06-19 21:54:04 +0200
commitbb0bf287d8fcb59a7d44661681576f77845dedbc (patch)
tree5cae0ee59152b2fa77a0e3ea0d6713dba7755bce
parent015db5800ca7c6dd2d201eacb2951e72e6782b30 (diff)
downloadbusybox-bb0bf287d8fcb59a7d44661681576f77845dedbc.zip
busybox-bb0bf287d8fcb59a7d44661681576f77845dedbc.tar.gz
randomconfig fixes 2
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--libbb/Kbuild.src1
-rwxr-xr-xscripts/randomtest2
-rwxr-xr-xtestsuite/ar.tests2
-rwxr-xr-xtestsuite/tar.tests4
4 files changed, 6 insertions, 3 deletions
diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
index b08ce11..52a90e9 100644
--- a/libbb/Kbuild.src
+++ b/libbb/Kbuild.src
@@ -145,6 +145,7 @@ lib-$(CONFIG_FTPD) += correct_password.o
lib-$(CONFIG_PASSWD) += pw_encrypt.o update_passwd.o obscure.o
lib-$(CONFIG_CHPASSWD) += pw_encrypt.o update_passwd.o
lib-$(CONFIG_CRYPTPW) += pw_encrypt.o
+lib-$(CONFIG_MKPASSWD) += pw_encrypt.o
lib-$(CONFIG_SULOGIN) += pw_encrypt.o correct_password.o
lib-$(CONFIG_VLOCK) += pw_encrypt.o correct_password.o
lib-$(CONFIG_SU) += pw_encrypt.o correct_password.o
diff --git a/scripts/randomtest b/scripts/randomtest
index 41f252a..287f1c7 100755
--- a/scripts/randomtest
+++ b/scripts/randomtest
@@ -115,6 +115,8 @@ fi
# Build!
nice -n 10 make $MAKEOPTS 2>&1 | tee make.log
+grep 'Rerun make' make.log \
+&& nice -n 10 make $MAKEOPTS 2>&1 | tee -a make.log
# Return exitcode 1 if busybox executable does not exist
test -x busybox
diff --git a/testsuite/ar.tests b/testsuite/ar.tests
index 0a8eb9b..ad7b8fe 100755
--- a/testsuite/ar.tests
+++ b/testsuite/ar.tests
@@ -15,7 +15,7 @@ testing "ar creates archives" \
"$(md5sum <README)\n" \
"" \
""
-rm test.a
+rm test.a 2>/dev/null
testing "ar replaces things in archives" \
"echo 'blah!' >file1 && echo 'blast!' >file2 && ar cr test.a README file1 file2 && mv file2 file1 && ar cr test.a file1 && ar p test.a file1" \
diff --git a/testsuite/tar.tests b/testsuite/tar.tests
index 890a73d..e902166 100755
--- a/testsuite/tar.tests
+++ b/testsuite/tar.tests
@@ -266,7 +266,7 @@ SKIP=
# The correct implementation unlinks target before
# creating the second file.
# We test that /tmp/passwd remains empty:
-optional UUDECODE FEATURE_SEAMLESS_BZ2
+optional UUDECODE FEATURE_TAR_AUTODETECT FEATURE_SEAMLESS_BZ2
testing "tar does not extract into symlinks" "\
>>/tmp/passwd && uudecode -o input && tar xf input 2>&1 && rm passwd; cat /tmp/passwd; echo \$?
" "\
@@ -282,7 +282,7 @@ l4/V8LDoe90yiWJhOJvIypgEfxdyRThQkBVn/bI=
"
SKIP=
# And same with -k
-optional UUDECODE FEATURE_SEAMLESS_BZ2
+optional UUDECODE FEATURE_TAR_AUTODETECT FEATURE_SEAMLESS_BZ2
testing "tar -k does not extract into symlinks" "\
>>/tmp/passwd && uudecode -o input && tar xf input -k 2>&1 && rm passwd; cat /tmp/passwd; echo \$?
" "\