summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko2020-06-24 00:27:37 +0200
committerDenys Vlasenko2020-06-24 00:27:37 +0200
commit7c443d110d4dc51ba48bad8ed1427716b754bf2e (patch)
treea233fcb29ef534eda8b3d2c18459399aeeb1234d
parent5fa5c4bde8b9ab75fa0ed37ee2fafca3fd46288a (diff)
downloadbusybox-7c443d110d4dc51ba48bad8ed1427716b754bf2e.zip
busybox-7c443d110d4dc51ba48bad8ed1427716b754bf2e.tar.gz
randomconfig fixes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--archival/cpio.c1
-rwxr-xr-xscripts/randomtest3
-rwxr-xr-xtestsuite/mdev.tests4
3 files changed, 6 insertions, 2 deletions
diff --git a/archival/cpio.c b/archival/cpio.c
index 0f37ffb..94b4b81 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 ec2f095..76550d2 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 8e53ec5..44a7230 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" \