Pádraig Brady wrote: > On 08/08/2012 03:57 PM, Jim Meyering wrote: >> Here's a preview of what coreutils-8.18 should look like. >> >> I noticed one spurious test failure reported by the Nixos Hydra autobuilder: >> >> http://hydra.nixos.org/build/2924158 >> >> It's in the most recently added test, so we'll probably have to fix it >> before release but I haven't investigated yet or seen it anywhere else: >> >> FAIL: df/total-unprocessed (exit: 1) >> ==================================== >> ... >> + df --local -t nfs --total . >> Filesystem 1K-blocks Used Available Use% Mounted on >> - 453794636 325690492 105389844 76% / >> total 453794636 325690492 105389844 76% >> + fail=1 >> + compare exp out >> + compare_dev_null_ exp out >> + test 2 = 2 >> + test xexp = x/dev/null >> + test xout = x/dev/null >> + return 2 >> + case $? in >> + compare_ exp out >> + diff -u exp out >> --- exp 2012-08-07 07:13:23.862331198 +0000 >> +++ out 2012-08-07 07:13:23.864331274 +0000 >> @@ -1 +1 @@ >> -df: no file systems processed >> +df: Warning: cannot read table of mounted file systems:\ >> No such file or directory >> + fail=1 >> ... > > Hopefully the attached should fix it up.
Thanks for the quick fix! Looks great. > Subject: [PATCH] tests: fix validation of local file systems > > * tests/init.cfg (require_mount_list_): A new function > to ensure we cant read the list of file systems. s/cant/can/ > (require_local_dir_): Call the above function as otherwise > the check is invalid. > * tests/df/total-unprocessed: Ensure df can read the > list of mounted file systems so that --local can be honored. > --- > tests/df/total-unprocessed | 3 ++- > tests/init.cfg | 7 +++++++ > 2 files changed, 9 insertions(+), 1 deletions(-) > > diff --git a/tests/df/total-unprocessed b/tests/df/total-unprocessed > index 9742591..aa49836 100755 > --- a/tests/df/total-unprocessed > +++ b/tests/df/total-unprocessed > @@ -19,6 +19,7 @@ > > . "${srcdir=.}/init.sh"; path_prepend_ ../src > print_ver_ df > +require_mount_list_ > > cat <<\EOF > exp || framework_failure_ > df: no file systems processed > @@ -27,7 +28,7 @@ EOF > # The following simply finds no match for the combination > # of the options --local and FS-type nfs together with the > # argument ".". It must exit non-Zero nonetheless. > -df --local -t nfs --total "." 2>out && fail=1 > +df --local -t nfs --total '.' 2>out && fail=1 > compare exp out || fail=1 > > cat <<\EOF > exp || framework_failure_ > diff --git a/tests/init.cfg b/tests/init.cfg > index 506c9b3..15b52e7 100644 > --- a/tests/init.cfg > +++ b/tests/init.cfg > @@ -77,8 +77,15 @@ is_local_dir_() > df --local "$1" >/dev/null 2>&1 > } > > +require_mount_list_() > +{ > + df >/dev/null 2>&1 || > + skip_ "Unable to read the list of mounted file systems." > +} > + > require_local_dir_() > { > + require_mount_list_ > is_local_dir_ . || > skip_ "This test must be run on a local file system." > }