From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Tue, 23 Jun 2020 22:27:37 +0000 (+0200)
Subject: randomconfig fixes
X-Git-Tag: 1_32_0~6
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7c443d110d4dc51ba48bad8ed1427716b754bf2e;p=oweals%2Fbusybox.git

randomconfig fixes

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

diff --git a/archival/cpio.c b/archival/cpio.c
index 0f37ffbb9..94b4b8174 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -516,6 +516,7 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
 	if (archive_handle->cpio__blocks != (off_t)-1
 	 && !(opt & OPT_QUIET)
 	) {
+		fflush_all();
 		fprintf(stderr, "%"OFF_FMT"u blocks\n", archive_handle->cpio__blocks);
 	}
 
diff --git a/scripts/randomtest b/scripts/randomtest
index ec2f095b2..76550d267 100755
--- a/scripts/randomtest
+++ b/scripts/randomtest
@@ -117,6 +117,7 @@ fi
 if test x"$LIBC" = x"musl"; then
 	cat .config \
 	| grep -v CONFIG_STATIC \
+	| grep -v CONFIG_DEBUG_SANITIZE \
 	| grep -v CONFIG_LFS \
 	| grep -v CONFIG_EXTRA_COMPAT \
 	| grep -v CONFIG_FEATURE_2_4_MODULES \
@@ -126,6 +127,8 @@ if test x"$LIBC" = x"musl"; then
 	>.config.new
 	mv .config.new .config
 	echo 'CONFIG_STATIC=y' >>.config
+	# "error: cannot specify -static with -fsanitize=address":
+	echo '# CONFIG_DEBUG_SANITIZE is not set' >>.config
 	# with LFS off, uoff_t will have wrong width:
 	echo 'CONFIG_LFS=y' >>.config
 	echo '# CONFIG_EXTRA_COMPAT is not set' >>.config
diff --git a/testsuite/mdev.tests b/testsuite/mdev.tests
index 8e53ec564..44a723024 100755
--- a/testsuite/mdev.tests
+++ b/testsuite/mdev.tests
@@ -93,7 +93,7 @@ SKIP=
 # continuing to use directory structure from prev test
 rm -rf mdev.testdir/dev/*
 echo "sda 0:0 444 >disk/scsiA" >mdev.testdir/etc/mdev.conf
-optional STATIC FEATURE_MDEV_CONF FEATURE_MDEV_RENAME FEATURE_LS_RECURSIVE FEATURE_LS_TIMESTAMPS FEATURE_LS_USERNAME
+optional STATIC FEATURE_MDEV_CONF FEATURE_MDEV_RENAME FEATURE_LS_RECURSIVE FEATURE_LS_TIMESTAMPS FEATURE_LS_USERNAME FEATURE_LS_SORTFILES
 testing "mdev move/symlink rule '>bar/baz'" \
 	"env - PATH=$PATH ACTION=add DEVPATH=/block/sda chroot mdev.testdir /mdev 2>&1;
 	ls -lnR mdev.testdir/dev | $FILTER_LS2" \
@@ -111,7 +111,7 @@ SKIP=
 # continuing to use directory structure from prev test
 rm -rf mdev.testdir/dev/*
 echo "sda 0:0 444 >disk/" >mdev.testdir/etc/mdev.conf
-optional STATIC FEATURE_MDEV_CONF FEATURE_MDEV_RENAME FEATURE_LS_RECURSIVE FEATURE_LS_TIMESTAMPS FEATURE_LS_USERNAME
+optional STATIC FEATURE_MDEV_CONF FEATURE_MDEV_RENAME FEATURE_LS_RECURSIVE FEATURE_LS_TIMESTAMPS FEATURE_LS_USERNAME FEATURE_LS_SORTFILES
 testing "mdev move/symlink rule '>bar/'" \
 	"env - PATH=$PATH ACTION=add DEVPATH=/block/sda chroot mdev.testdir /mdev 2>&1;
 	ls -lnR mdev.testdir/dev | $FILTER_LS2" \