emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

randomconfig fixes 2

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2016-06-19 21:54:04 +02:00
parent 015db5800c
commit bb0bf287d8
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libbb/Kbuild.src
View File

@ -145,6 +145,7 @@ lib-$(CONFIG_FTPD) += correct_password.o
lib-$(CONFIG_PASSWD) += pw_encrypt.o update_passwd.o obscure.o lib-$(CONFIG_PASSWD) += pw_encrypt.o update_passwd.o obscure.o
lib-$(CONFIG_CHPASSWD) += pw_encrypt.o update_passwd.o lib-$(CONFIG_CHPASSWD) += pw_encrypt.o update_passwd.o
lib-$(CONFIG_CRYPTPW) += pw_encrypt.o lib-$(CONFIG_CRYPTPW) += pw_encrypt.o
lib-$(CONFIG_MKPASSWD) += pw_encrypt.o
lib-$(CONFIG_SULOGIN) += pw_encrypt.o correct_password.o lib-$(CONFIG_SULOGIN) += pw_encrypt.o correct_password.o
lib-$(CONFIG_VLOCK) += pw_encrypt.o correct_password.o lib-$(CONFIG_VLOCK) += pw_encrypt.o correct_password.o
lib-$(CONFIG_SU) += pw_encrypt.o correct_password.o lib-$(CONFIG_SU) += pw_encrypt.o correct_password.o

2
scripts/randomtest
View File

@ -115,6 +115,8 @@ fi
# Build! # Build!
nice -n 10 make $MAKEOPTS 2>&1 | tee make.log 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 # Return exitcode 1 if busybox executable does not exist
test -x busybox test -x busybox

2
testsuite/ar.tests
View File

@ -15,7 +15,7 @@ testing "ar creates archives" \
"$(md5sum <README)\n" \ "$(md5sum <README)\n" \
"" \ "" \
"" ""
rm test.a rm test.a 2>/dev/null
testing "ar replaces things in archives" \ 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" \ "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" \

4
testsuite/tar.tests
View File

@ -266,7 +266,7 @@ SKIP=
# The correct implementation unlinks target before # The correct implementation unlinks target before
# creating the second file. # creating the second file.
# We test that /tmp/passwd remains empty: # 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" "\ testing "tar does not extract into symlinks" "\
>>/tmp/passwd && uudecode -o input && tar xf input 2>&1 && rm passwd; cat /tmp/passwd; echo \$? >>/tmp/passwd && uudecode -o input && tar xf input 2>&1 && rm passwd; cat /tmp/passwd; echo \$?
" "\ " "\
@ -282,7 +282,7 @@ l4/V8LDoe90yiWJhOJvIypgEfxdyRThQkBVn/bI=
" "
SKIP= SKIP=
# And same with -k # 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" "\ 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 \$? >>/tmp/passwd && uudecode -o input && tar xf input -k 2>&1 && rm passwd; cat /tmp/passwd; echo \$?
" "\ " "\