randomconfig fixes

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

diff --git a/archival/cpio.c b/archival/cpio.c
index 0f37ffbb9046330d8982bae97e376676b1fa9afa..94b4b817433754cc5c55a8ffbbf165b86bce11fe 100644 (file)
--- 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 ec2f095b2530171868e450b2edadc2527788f9d1..76550d267340533272855805ae8ab8c8c14fd281 100755 (executable)
--- 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 8e53ec5647b53c6de8c695f77705f7644702e0b1..44a723024f5f5bbb4d282e557048b08922ce5a22 100755 (executable)
--- 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" \