From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Mon, 12 Dec 2016 08:26:16 +0000 (+0100)
Subject: randomconfig fixes
X-Git-Tag: 1_26_0~9
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=52ae0980112f57bbdf4590f649432264d00cc943;p=oweals%2Fbusybox.git

randomconfig fixes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---

diff --git a/testsuite/bunzip2/bzcat-does-not-remove-compressed-file b/testsuite/bunzip2/bzcat-does-not-remove-compressed-file
deleted file mode 100644
index 7d4016ec5..000000000
--- a/testsuite/bunzip2/bzcat-does-not-remove-compressed-file
+++ /dev/null
@@ -1,3 +0,0 @@
-echo foo | bzip2 >foo.bz2
-busybox bzcat foo.bz2
-test -f foo.bz2
diff --git a/testsuite/bzcat/bzcat-does-not-remove-compressed-file b/testsuite/bzcat/bzcat-does-not-remove-compressed-file
new file mode 100644
index 000000000..7d4016ec5
--- /dev/null
+++ b/testsuite/bzcat/bzcat-does-not-remove-compressed-file
@@ -0,0 +1,3 @@
+echo foo | bzip2 >foo.bz2
+busybox bzcat foo.bz2
+test -f foo.bz2
diff --git a/testsuite/cpio.tests b/testsuite/cpio.tests
index d44c95b10..88ec086b6 100755
--- a/testsuite/cpio.tests
+++ b/testsuite/cpio.tests
@@ -127,6 +127,7 @@ testing "cpio extracts in existing directory" \
 " "" ""
 SKIP=
 
+optional FEATURE_CPIO_O
 testing "cpio uses by default uid/gid" \
 "echo $0 | cpio -o -H newc | cpio -tv 2>&1 | tail -n +2 | awk ' { print \$2 } '; echo \$?" \
 "\
@@ -135,6 +136,7 @@ $user/$group
 " "" ""
 SKIP=
 
+optional FEATURE_CPIO_O
 testing "cpio -R with create" \
 "echo $0 | cpio -o -H newc -R 1234:5678 | cpio -tv 2>&1 | tail -n +2 | awk ' { print \$2 } '; echo \$?" \
 "\
@@ -143,6 +145,7 @@ testing "cpio -R with create" \
 " "" ""
 SKIP=
 
+optional FEATURE_CPIO_O
 testing "cpio -R with extract" \
 "echo $0 | cpio -o -H newc | cpio -tv -R 8765:4321 2>&1 | tail -n +2 | awk ' { print \$2 } '; echo \$?" \
 "\
diff --git a/testsuite/tar.tests b/testsuite/tar.tests
index ffcbe9ba9..18883c966 100755
--- a/testsuite/tar.tests
+++ b/testsuite/tar.tests
@@ -299,7 +299,7 @@ l4/V8LDoe90yiWJhOJvIypgEfxdyRThQkBVn/bI=
 "
 SKIP=
 
-optional UNICODE_SUPPORT
+optional UNICODE_SUPPORT FEATURE_TAR_GNU_EXTENSIONS
 testing "Pax-encoded UTF8 names and symlinks" '\
 tar xvf ../tar.utf8.tar.bz2 2>&1; echo $?
 export LANG=en_US.UTF-8