[PATCH] Use wc instead of awk to count subtrees in t0090-cache-tree
- From
Ben Walton <bdwalton@gmail.com>
- Date
- Dec 22, 2014, 17:52 UTC
- Message-ID
- <1419270744-1408-1-git-send-email-bdwalton@gmail.com>
The awk statements previously used in this test weren't compatible with the native versions of awk on Solaris:
echo "dir" | /bin/awk -v c=0 '$1 {++c} END {print c}' awk: syntax error near line 1 awk: bailing out near line 1
echo "dir" | /usr/xpg4/bin/awk -v c=0 '$1 {++c} END {print c}' 0
And with GNU awk for comparison: echo "dir" | /opt/csw/gnu/awk -v c=0 '$1 {++c} END {print c}' 1
Instead of modifying the awk code to work, use wc -w instead as that is both adequate and simpler.
Signed-off-by: Ben Walton <bdwalton@gmail.com> --- t/t0090-cache-tree.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t0090-cache-tree.sh b/t/t0090-cache-tree.sh index 067f4c6..f2b1c9c 100755 --- a/t/t0090-cache-tree.sh +++ b/t/t0090-cache-tree.sh @@ -22,7 +22,7 @@ generate_expected_cache_tree_rec () { # ls-files might have foo/bar, foo/bar/baz, and foo/bar/quux # We want to count only foo because it's the only direct child subtrees=$(git ls-files|grep /|cut -d / -f 1|uniq) && - subtree_count=$(echo "$subtrees"|awk -v c=0 '$1 {++c} END {print c}') && + subtree_count=$(echo "$subtrees"|wc -w) && entries=$(git ls-files|wc -l) && printf "SHA $dir (%d entries, %d subtrees)\n" "$entries" "$subtree_count" && for subtree in $subtrees
-- 1.9.1