test-meta: use grep -a on xstat/meta

xattr data may contain arbitrary bytes, including NUL.
If we use grep on such data without -a, then it just
prints "Binary file (standard input) matches" and we
haven't tested anything.

Use grep -a for the appropriate invocations to avoid
this issue, we only care about ascii lines here.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Reviewed-by: Rob Browning <rlb@defaultvalue.org>

diff --git a/t/test-meta.sh b/t/test-meta.sh
index 73ce11672063c54c188508b7e7afb52ffb5fbb44..d705c644afdb5743f89919937e005d006e5f73f2 100755 (executable)
--- a/t/test-meta.sh
+++ b/t/test-meta.sh
@@ -482,28 +482,28 @@ src/foo/3"
 
     # Test --numeric-ids (gid).
     WVPASS rm -rf src
-    current_gidx=$(bup meta -tvvf ../src.meta | grep -e '^gid:') || exit $?
+    current_gidx=$(bup meta -tvvf ../src.meta | grep -ae '^gid:') || exit $?
     WVPASS bup meta --edit --set-group "$last_group" ../src.meta \
         | WVPASS bup meta -x --numeric-ids
-    new_gidx=$(bup xstat src | grep -e '^gid:') || exit $?
+    new_gidx=$(bup xstat src | grep -ae '^gid:') || exit $?
     WVPASSEQ "$current_gidx" "$new_gidx"
 
     # Test that restoring an unknown user works.
     unknown_user=$("$TOP"/t/unknown-owner --user) || exit $?
     WVPASS rm -rf src
-    current_uidx=$(bup meta -tvvf ../src.meta | grep -e '^uid:') || exit $?
+    current_uidx=$(bup meta -tvvf ../src.meta | grep -ae '^uid:') || exit $?
     WVPASS bup meta --edit --set-user "$unknown_user" ../src.meta \
         | WVPASS bup meta -x
-    new_uidx=$(bup xstat src | grep -e '^uid:') || exit $?
+    new_uidx=$(bup xstat src | grep -ae '^uid:') || exit $?
     WVPASSEQ "$current_uidx" "$new_uidx"
 
     # Test that restoring an unknown group works.
     unknown_group=$("$TOP"/t/unknown-owner --group) || exit $?
     WVPASS rm -rf src
-    current_gidx=$(bup meta -tvvf ../src.meta | grep -e '^gid:') || exit $?
+    current_gidx=$(bup meta -tvvf ../src.meta | grep -ae '^gid:') || exit $?
     WVPASS bup meta --edit --set-group "$unknown_group" ../src.meta \
         | WVPASS bup meta -x
-    new_gidx=$(bup xstat src | grep -e '^gid:') || exit $?
+    new_gidx=$(bup xstat src | grep -ae '^gid:') || exit $?
     WVPASSEQ "$current_gidx" "$new_gidx"
 
     WVPASS rm -r "$tmpdir"