mirror of
https://github.com/git/git
synced 2024-08-23 18:00:25 +00:00
test-lib: retire "lint harder" optimization hack
`test_run_` in test-lib.sh "lints" the body of a test by sending it down a `sed chainlint.sed | grep` pipeline; this happens once for each test run by a test script. Although this pipeline may seem relatively cheap in isolation, it can become expensive when invoked 26800+ times by `make test`, once for each test run, despite the existence of only 16500+ test definitions across all tests scripts. This difference in the number of tests defined in the scripts (16500+) and the number of tests actually run by `make test` (26800+) is explained by the fact that some test scripts run a very large number of small tests, all driven by a series of functions/loops which fill in the test bodies. This means that certain test definitions are being linted repeatedly (tens or hundreds of times) unnecessarily. To avoid such unnecessary work,2d86a96220
(t: avoid sed-based chain-linting in some expensive cases, 2021-05-13) added an optimization hack which allows individual scripts to manually suppress the unnecessary repeated linting of the same test definition. However, unlike chainlint.sed which checks a test body as the test is run, chainlint.pl checks each test definition just once, no matter how many times the test is run, thus the sort of optimization hack introduced by2d86a96220
is no longer needed and can be retired. Therefore, revert2d86a96220
. Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
56066523ed
commit
9fd911237f
5
t/README
5
t/README
|
@ -196,11 +196,6 @@ appropriately before running "make". Short options can be bundled, i.e.
|
|||
this feature by setting the GIT_TEST_CHAIN_LINT environment
|
||||
variable to "1" or "0", respectively.
|
||||
|
||||
A few test scripts disable some of the more advanced
|
||||
chain-linting detection in the name of efficiency. You can
|
||||
override this by setting the GIT_TEST_CHAIN_LINT_HARDER
|
||||
environment variable to "1".
|
||||
|
||||
--stress::
|
||||
Run the test script repeatedly in multiple parallel jobs until
|
||||
one of them fails. Useful for reproducing rare failures in
|
||||
|
|
|
@ -387,9 +387,7 @@ test_expect_success 'setup main' '
|
|||
test_tick
|
||||
'
|
||||
|
||||
# Disable extra chain-linting for the next set of tests. There are many
|
||||
# auto-generated ones that are not worth checking over and over.
|
||||
GIT_TEST_CHAIN_LINT_HARDER_DEFAULT=0
|
||||
|
||||
|
||||
warn_LF_CRLF="LF will be replaced by CRLF"
|
||||
warn_CRLF_LF="CRLF will be replaced by LF"
|
||||
|
@ -606,9 +604,6 @@ do
|
|||
checkout_files "" "$id" "crlf" true "" CRLF CRLF CRLF CRLF_mix_CR CRLF_nul
|
||||
done
|
||||
|
||||
# The rest of the tests are unique; do the usual linting.
|
||||
unset GIT_TEST_CHAIN_LINT_HARDER_DEFAULT
|
||||
|
||||
# Should be the last test case: remove some files from the worktree
|
||||
test_expect_success 'ls-files --eol -d -z' '
|
||||
rm crlf_false_attr__CRLF.txt crlf_false_attr__CRLF_mix_LF.txt crlf_false_attr__LF.txt .gitattributes &&
|
||||
|
|
|
@ -5,11 +5,6 @@ test_description='wildmatch tests'
|
|||
TEST_PASSES_SANITIZE_LEAK=true
|
||||
. ./test-lib.sh
|
||||
|
||||
# Disable expensive chain-lint tests; all of the tests in this script
|
||||
# are variants of a few trivial test-tool invocations, and there are a lot of
|
||||
# them.
|
||||
GIT_TEST_CHAIN_LINT_HARDER_DEFAULT=0
|
||||
|
||||
should_create_test_file() {
|
||||
file=$1
|
||||
|
||||
|
|
|
@ -1091,11 +1091,8 @@ test_run_ () {
|
|||
trace=
|
||||
# 117 is magic because it is unlikely to match the exit
|
||||
# code of other programs
|
||||
if test "OK-117" != "$(test_eval_ "(exit 117) && $1${LF}${LF}echo OK-\$?" 3>&1)" ||
|
||||
{
|
||||
test "${GIT_TEST_CHAIN_LINT_HARDER:-${GIT_TEST_CHAIN_LINT_HARDER_DEFAULT:-1}}" != 0 &&
|
||||
$(printf '%s\n' "$1" | sed -f "$GIT_BUILD_DIR/t/chainlint.sed" | grep -q '?![A-Z][A-Z]*?!')
|
||||
}
|
||||
if $(printf '%s\n' "$1" | sed -f "$GIT_BUILD_DIR/t/chainlint.sed" | grep -q '?![A-Z][A-Z]*?!') ||
|
||||
test "OK-117" != "$(test_eval_ "(exit 117) && $1${LF}${LF}echo OK-\$?" 3>&1)"
|
||||
then
|
||||
BUG "broken &&-chain or run-away HERE-DOC: $1"
|
||||
fi
|
||||
|
|
Loading…
Reference in a new issue