If my mistake using --stress= instead of --stress-limit= is any indication, then the current options are very confusing. This is my attempt at making them less confusing. Changes since v1: * Now the patches actually adjust the documentation according to the changes ;-) Johannes Schindelin (2): tests: let --stress-limit=<N> imply --stress tests: introduce --stress-jobs=<N> t/README | 8 +++++--- t/test-lib.sh | 9 ++++++++- 2 files changed, 13 insertions(+), 4 deletions(-) base-commit: 7d661e5ed16dca303d7898f5ab0cc2ffc69e0499 Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-155%2Fdscho%2Fstress-test-extra-v2 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-155/dscho/stress-test-extra-v2 Pull-Request: https://github.com/gitgitgadget/git/pull/155 Range-diff vs v1: 1: 16c6508c4b ! 1: fbe773c22a tests: let --stress-limit=<N> imply --stress @@ -8,6 +8,19 @@ Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx> + diff --git a/t/README b/t/README + --- a/t/README + +++ b/t/README +@@ + --stress-limit=<N>:: + 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. + diff --git a/t/test-lib.sh b/t/test-lib.sh --- a/t/test-lib.sh +++ b/t/test-lib.sh 2: 281d3f1d19 ! 2: 074628c22b tests: introduce --stress-jobs=<N> @@ -13,6 +13,33 @@ Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx> + diff --git a/t/README b/t/README + --- a/t/README + +++ b/t/README +@@ + variable to "1" or "0", respectively. + + --stress:: +---stress=<N>:: + 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: <N>, 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 +@@ + '.stress-<nr>' suffix, and the trash directory of the failed + test job is renamed to end with a '.stress-failed' suffix. + ++--stress-jobs=<N>:: ++ Override the number of parallel jobs. Implies `--stress`. ++ + --stress-limit=<N>:: + When combined with --stress run the test script repeatedly + this many times in each of the parallel jobs or until one of + diff --git a/t/test-lib.sh b/t/test-lib.sh --- a/t/test-lib.sh +++ b/t/test-lib.sh -- gitgitgadget
