Merge branch 'jk/trailer-fixes' into maint

diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
index 34859fe4a59fdbb48273f4b9e4f16e878b421349..850f651e4e434084bbc8995fcfb3bb001d83875c 100755 (executable)
--- a/t/t0000-basic.sh
+++ b/t/t0000-basic.sh
@@ -116,7 +116,7 @@ check_sub_test_lib_test () {
        name="$1" # stdin is the expected output from the test
        (
                cd "$name" &&
-               ! test -s err &&
+               test_must_be_empty err &&
                sed -e 's/^> //' -e 's/Z$//' >expect &&
                test_cmp expect out
        )