randomconfig fixes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2020-06-24 00:27:37 +02:00
parent 5fa5c4bde8
commit 7c443d110d
3 changed files with 6 additions and 2 deletions

View File

@ -516,6 +516,7 @@ int cpio_main(int argc UNUSED_PARAM, char **argv)
if (archive_handle->cpio__blocks != (off_t)-1 if (archive_handle->cpio__blocks != (off_t)-1
&& !(opt & OPT_QUIET) && !(opt & OPT_QUIET)
) { ) {
fflush_all();
fprintf(stderr, "%"OFF_FMT"u blocks\n", archive_handle->cpio__blocks); fprintf(stderr, "%"OFF_FMT"u blocks\n", archive_handle->cpio__blocks);
} }

View File

@ -117,6 +117,7 @@ fi
if test x"$LIBC" = x"musl"; then if test x"$LIBC" = x"musl"; then
cat .config \ cat .config \
| grep -v CONFIG_STATIC \ | grep -v CONFIG_STATIC \
| grep -v CONFIG_DEBUG_SANITIZE \
| grep -v CONFIG_LFS \ | grep -v CONFIG_LFS \
| grep -v CONFIG_EXTRA_COMPAT \ | grep -v CONFIG_EXTRA_COMPAT \
| grep -v CONFIG_FEATURE_2_4_MODULES \ | grep -v CONFIG_FEATURE_2_4_MODULES \
@ -126,6 +127,8 @@ if test x"$LIBC" = x"musl"; then
>.config.new >.config.new
mv .config.new .config mv .config.new .config
echo 'CONFIG_STATIC=y' >>.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: # with LFS off, uoff_t will have wrong width:
echo 'CONFIG_LFS=y' >>.config echo 'CONFIG_LFS=y' >>.config
echo '# CONFIG_EXTRA_COMPAT is not set' >>.config echo '# CONFIG_EXTRA_COMPAT is not set' >>.config

View File

@ -93,7 +93,7 @@ SKIP=
# continuing to use directory structure from prev test # continuing to use directory structure from prev test
rm -rf mdev.testdir/dev/* rm -rf mdev.testdir/dev/*
echo "sda 0:0 444 >disk/scsiA" >mdev.testdir/etc/mdev.conf 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'" \ testing "mdev move/symlink rule '>bar/baz'" \
"env - PATH=$PATH ACTION=add DEVPATH=/block/sda chroot mdev.testdir /mdev 2>&1; "env - PATH=$PATH ACTION=add DEVPATH=/block/sda chroot mdev.testdir /mdev 2>&1;
ls -lnR mdev.testdir/dev | $FILTER_LS2" \ ls -lnR mdev.testdir/dev | $FILTER_LS2" \
@ -111,7 +111,7 @@ SKIP=
# continuing to use directory structure from prev test # continuing to use directory structure from prev test
rm -rf mdev.testdir/dev/* rm -rf mdev.testdir/dev/*
echo "sda 0:0 444 >disk/" >mdev.testdir/etc/mdev.conf 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/'" \ testing "mdev move/symlink rule '>bar/'" \
"env - PATH=$PATH ACTION=add DEVPATH=/block/sda chroot mdev.testdir /mdev 2>&1; "env - PATH=$PATH ACTION=add DEVPATH=/block/sda chroot mdev.testdir /mdev 2>&1;
ls -lnR mdev.testdir/dev | $FILTER_LS2" \ ls -lnR mdev.testdir/dev | $FILTER_LS2" \