On 07/28/2013 04:09 PM, Bernhard Voelker wrote: > On 07/28/2013 01:29 AM, Pádraig Brady wrote: >> Prompted by the continuous integration build failure at: >> http://hydra.nixos.org/build/5582213 >> >> * test/du/inodes.sh: Due to undefined order in returned directory >> entries, the expected output might not match, so sort both expected >> and actual output when returning --all directory entries. > > Thanks for fixing this. > I wondered myself while prototyping why the order was different, > but didn't get back to that issue. Sorry. > >> Also use a simpler test for ensuring no errors are output. > ... >> -compare /dev/null err || fail=1 >> +test -s err && fail=1 > > This is admittedly simpler, but will prevent an actual error > message to show up automatically in the case of a test failure > report: compare() calls compare_dev_null_() which would do that > for free. > > While we're at it, I think the following could be changed for > a similar reason: > > - compare exp out || { cat out; fail=1; } > + compare exp out || fail=1 > > The diff would be shown automatically there, too, so we could > leave out the "cat out"s. > WDYT?
Agreed on both points. thanks, Pádraig.
