CC-tea/coreutils
1
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-04-21 11:16:16 +02:00
Code Issues Projects Releases Wiki Activity

tests: fix false test failure with df on Debian/kFreeBSD

Browse Source 
* tests/fs/skip-duplicates.sh: On this platform .mnt_opts is significant
so define to empty to avoid a NULL deref in read_file_system_list().
Fixes http://bugs.gnu.org/20210
This commit is contained in:
Assaf Gordon
2015-03-27 09:38:48 +00:00
committed by Pádraig Brady
parent 41d0fc1c37
commit cbed4b3376
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tests/df/skip-duplicates.sh
View File

@@ -73,16 +73,16 @@ struct mntent *getmntent (FILE *fp)
}
static struct mntent mntents[] = {
{.mnt_fsname="/short", .mnt_dir="/invalid/mount/dir"},
{.mnt_fsname="fsname", .mnt_dir="/",},
{.mnt_fsname="/fsname", .mnt_dir="/."},
{.mnt_fsname="/fsname", .mnt_dir="/"},
{.mnt_fsname="virtfs", .mnt_dir="/NONROOT", .mnt_type="fstype1"},
{.mnt_fsname="virtfs2", .mnt_dir="/NONROOT", .mnt_type="fstype2"},
{.mnt_fsname="netns", .mnt_dir="net:[1234567]"},
{.mnt_fsname="rem:ote1",.mnt_dir="/REMOTE"},
{.mnt_fsname="rem:ote1",.mnt_dir="/REMOTE"},
{.mnt_fsname="rem:ote2",.mnt_dir="/REMOTE"},
{.mnt_fsname="/short", .mnt_dir="/invalid/mount/dir", .mnt_opts=""},
{.mnt_fsname="fsname", .mnt_dir="/", .mnt_opts=""},
{.mnt_fsname="/fsname", .mnt_dir="/.", .mnt_opts=""},
{.mnt_fsname="/fsname", .mnt_dir="/", .mnt_opts=""},
{.mnt_fsname="virtfs", .mnt_dir="/NONROOT", .mnt_type="t1", .mnt_opts=""},
{.mnt_fsname="virtfs2", .mnt_dir="/NONROOT", .mnt_type="t2", .mnt_opts=""},
{.mnt_fsname="netns", .mnt_dir="net:[1234567]", .mnt_opts=""},
{.mnt_fsname="rem:ote1",.mnt_dir="/REMOTE", .mnt_opts=""},
{.mnt_fsname="rem:ote1",.mnt_dir="/REMOTE", .mnt_opts=""},
{.mnt_fsname="rem:ote2",.mnt_dir="/REMOTE", .mnt_opts=""},
};
if (done == 1)
@@ -151,7 +151,7 @@ if test "$unique_entries" = 2; then
fi
# df should use the last seen devname (mnt_fsname) and devtype (mnt_type)
test $(grep -c 'virtfs2.*fstype2' <out) -eq 1 || { fail=1; cat out; }
test $(grep -c 'virtfs2.*t2' <out) -eq 1 || { fail=1; cat out; }
# Ensure that filtering duplicates does not affect -a processing.
LD_PRELOAD=./k.so df -a >out || fail=1