tests: lint for run-away here-doc
authorJunio C Hamano <gitster@pobox.com>
Thu, 23 Mar 2017 05:43:18 +0000 (22:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 24 Mar 2017 03:56:49 +0000 (20:56 -0700)
We found a few run-away here documents that are started with an
end-of-here-doc marker that is incorrectly spelled, e.g.

git some command >actual &&
cat <<EOF >expect
...
EOF &&
test_cmp expect actual

which ends up slurping the entire remainder of the script as if it
were the data. Often the command that gets misused like this exits
without failure (e.g. "cat" in the above example), which makes the
command appear to work, without ever executing the remainder of the
test.

Piggy-back on the test that catches &&-chain breakage to detect this
case as well.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/test-lib.sh
index 86d77c16dd3abcedd3fd4937a73b142a6b83b7b6..d5f2b70bce53227a47a73ec8e78abaeb9e3c6436 100644 (file)
@@ -624,9 +624,9 @@ test_run_ () {
                trace=
                # 117 is magic because it is unlikely to match the exit
                # code of other programs
-               test_eval_ "(exit 117) && $1"
-               if test "$?" != 117; then
-                       error "bug in the test script: broken &&-chain: $1"
+               if test "OK-117" != "$(test_eval_ "(exit 117) && $1${LF}${LF}echo OK-\$?" 3>&1)"
+               then
+                       error "bug in the test script: broken &&-chain or run-away HERE-DOC: $1"
                fi
                trace=$trace_tmp
        fi