d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

:l_flag:: be more aggressive when normalizing whitespace

Browse Source 
Save output from ls -ldT and stat -l, then normalize all repeating whitespace using
sed to single column spaces.

This makes the test flexible with single-digit days, etc, similar to r320723. This
approach is just a bit more of a hammer approach because of how the columns are
ordered/spaced in both ls and stat.

MFC after:	1 week
MFC with:	r319841
This commit is contained in:
ngie 2017-07-06 07:37:03 +00:00
parent 2e06cea2fe
commit 43864a60b9
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
usr.bin/stat/tests/stat_test.sh
View File

@ -60,14 +60,23 @@ l_flag_body()
paths="a b c d"
ls_out=ls.output
stat_out=stat.output
# NOTE:
# - Even though stat -l claims to be equivalent to `ls -lT`, the
# whitespace is a bit more liberal in the `ls -lT` output.
# - `ls -ldT` is used to not recursively list the contents of
# directories.
for path in $paths; do
atf_check -o inline:"$(ls -ldT $path | sed -e 's, , ,g')\n" \
stat -l $path
atf_check -o save:$ls_out ls -ldT $path
cat $ls_out
atf_check -o save:$stat_out stat -l $path
cat $stat_out
echo "Comparing normalized whitespace"
atf_check sed -i '' -E -e 's/[[:space:]]+/ /g' $ls_out
atf_check sed -i '' -E -e 's/[[:space:]]+/ /g' $stat_out
atf_check cmp $ls_out $stat_out
done
}