Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jc/lint-runaway-here-doc'
author
Junio C Hamano
<gitster@pobox.com>
Mon, 27 Mar 2017 17:59:25 +0000
(10:59 -0700)
committer
Junio C Hamano
<gitster@pobox.com>
Mon, 27 Mar 2017 17:59:25 +0000
(10:59 -0700)
The test framework learned to detect unterminated here documents.
* jc/lint-runaway-here-doc:
tests: lint for run-away here-doc
t/test-lib.sh
patch
|
blob
|
history
raw
(from parent 1:
c473af7
)
diff --git
a/t/test-lib.sh
b/t/test-lib.sh
index 23c29bce6edbb5b921145e80849600896c2e1e3f..13b5696822d7cd054ed00cd5b4111ab39d3606cb 100644
(file)
--- a/
t/test-lib.sh
+++ b/
t/test-lib.sh
@@
-625,9
+625,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