From: Junio C Hamano Date: Thu, 25 Apr 2019 07:41:12 +0000 (+0900) Subject: Merge branch 'sg/test-atexit' X-Git-Tag: v2.22.0-rc0~73 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/579b75ad9530827fe00740b8551963f16f279c40?ds=inline;hp=-c Merge branch 'sg/test-atexit' Test framework update to more robustly clean up leftover files and processes after tests are done. * sg/test-atexit: t9811-git-p4-label-import: fix pipeline negation git p4 test: disable '-x' tracing in the p4d watchdog loop git p4 test: simplify timeout handling git p4 test: clean up the p4d cleanup functions git p4 test: use 'test_atexit' to kill p4d and the watchdog process t0301-credential-cache: use 'test_atexit' to stop the credentials helper tests: use 'test_atexit' to stop httpd git-daemon: use 'test_atexit` to stop 'git-daemon' test-lib: introduce 'test_atexit' t/lib-git-daemon: make sure to kill the 'git-daemon' process test-lib: fix interrupt handling with 'dash' and '--verbose-log -x' --- 579b75ad9530827fe00740b8551963f16f279c40 diff --combined t/README index af1243eb49,0b03175c7d..6404f33e19 --- a/t/README +++ b/t/README @@@ -196,10 -196,11 +196,10 @@@ appropriately before running "make" variable to "1" or "0", respectively. --stress:: ---stress=:: Run the test script repeatedly in multiple parallel jobs until one of them fails. Useful for reproducing rare failures in flaky tests. The number of parallel jobs is, in order of - precedence: , or the value of the GIT_TEST_STRESS_LOAD + precedence: the value of the GIT_TEST_STRESS_LOAD environment variable, or twice the number of available processors (as shown by the 'getconf' utility), or 8. Implies `--verbose -x --immediate` to get the most information @@@ -210,13 -211,10 +210,13 @@@ '.stress-' suffix, and the trash directory of the failed test job is renamed to end with a '.stress-failed' suffix. +--stress-jobs=:: + Override the number of parallel jobs. Implies `--stress`. + --stress-limit=:: When combined with --stress run the test script repeatedly this many times in each of the parallel jobs or until one of - them fails, whichever comes first. + them fails, whichever comes first. Implies `--stress`. You can also set the GIT_TEST_INSTALLED environment variable to the bindir of an existing git installation to test that installation. @@@ -343,9 -341,6 +343,9 @@@ marked strings" in po/README for detail GIT_TEST_SPLIT_INDEX= forces split-index mode on the whole test suite. Accept any boolean values that are accepted by git-config. +GIT_TEST_PROTOCOL_VERSION=, when set, overrides the +'protocol.version' setting to n if it is less than n. + GIT_TEST_FULL_IN_PACK_ARRAY= exercises the uncommon pack-objects code path where there are more than 1024 packs even if the actual number of packs in repository is below this limit. Accept @@@ -384,8 -379,8 +384,8 @@@ the --no-sparse command-line argument GIT_TEST_PRELOAD_INDEX= exercises the preload-index code path by overriding the minimum number of cache entries required per thread. -GIT_TEST_REBASE_USE_BUILTIN=, when false, disables the -builtin version of git-rebase. See 'rebase.useBuiltin' in +GIT_TEST_STASH_USE_BUILTIN=, when false, disables the +built-in version of git-stash. See 'stash.useBuiltin' in git-config(1). GIT_TEST_INDEX_THREADS= enables exercising the multi-threaded loading @@@ -402,10 -397,6 +402,10 @@@ GIT_TEST_SIDEBAND_ALL=, when t fetch-pack to not request sideband-all (even if the server advertises sideband-all). +GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=, when true (which is +the default when running tests), errors out when an abbreviated option +is used. + Naming Tests ------------ @@@ -871,6 -862,26 +871,26 @@@ library for your script to use ... ' + - test_atexit