diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-05-19 13:17:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-19 13:17:54 -0700 |
| commit | da3d507ce06b5e081c440a8f4ac85df351b4cd1d (patch) | |
| tree | 6e80f5329cd722848fd78392278c923646333446 | |
| parent | 3e199decd5c02092d3e458be6be10874e12a51dd (diff) | |
| parent | 92b269f5c5e5c1d51e9318003caf8ae9d076b4e9 (diff) | |
| download | git-da3d507ce06b5e081c440a8f4ac85df351b4cd1d.tar.gz | |
Merge branch 'jk/test-chain-lint'
Developer support to automatically detect broken &&-chain in the
test scripts is now turned on by default.
* jk/test-chain-lint:
test-lib: turn on GIT_TEST_CHAIN_LINT by default
t7502-commit.sh: fix a broken and-chain
| -rwxr-xr-x | t/t7502-commit.sh | 2 | ||||
| -rw-r--r-- | t/test-lib.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh index 051489ea33..2e0d557243 100755 --- a/t/t7502-commit.sh +++ b/t/t7502-commit.sh @@ -370,7 +370,7 @@ exit 0 EOF test_expect_success !AUTOIDENT 'do not fire editor when committer is bogus' ' - >.git/result + >.git/result && >expect && echo >>negative && diff --git a/t/test-lib.sh b/t/test-lib.sh index 4ea99a209d..39da9c2d99 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -529,7 +529,7 @@ test_run_ () { test_cleanup=: expecting_failure=$2 - if test "${GIT_TEST_CHAIN_LINT:-0}" != 0; then + if test "${GIT_TEST_CHAIN_LINT:-1}" != 0; then # 117 is magic because it is unlikely to match the exit # code of other programs test_eval_ "(exit 117) && $1" |