diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-01-18 13:49:56 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-18 13:49:56 -0800 |
| commit | 3fe47ff44441de609d76fcd2dd510f66b6d84353 (patch) | |
| tree | a193c37b3414ee133058e3c34ce3901c6fabfb70 /t/lib-git-svn.sh | |
| parent | 2c0a645d9e1f7442d17a9666e57d6e72b09bb51b (diff) | |
| parent | fb7d1e3ac8f823dd00a5760952a7f7a9788de473 (diff) | |
| download | git-3fe47ff44441de609d76fcd2dd510f66b6d84353.tar.gz | |
Merge branch 'sg/stress-test'
Flaky tests can now be repeatedly run under load with the
"--stress" option.
* sg/stress-test:
test-lib: add the '--stress' option to run a test repeatedly under load
test-lib-functions: introduce the 'test_set_port' helper function
test-lib: set $TRASH_DIRECTORY earlier
test-lib: consolidate naming of test-results paths
test-lib: parse command line options earlier
test-lib: parse options in a for loop to keep $@ intact
test-lib: extract Bash version check for '-x' tracing
test-lib: translate SIGTERM and SIGHUP to an exit
Diffstat (limited to 't/lib-git-svn.sh')
| -rw-r--r-- | t/lib-git-svn.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh index a8130f9119..f3b478c307 100644 --- a/t/lib-git-svn.sh +++ b/t/lib-git-svn.sh @@ -13,6 +13,7 @@ fi GIT_DIR=$PWD/.git GIT_SVN_DIR=$GIT_DIR/svn/refs/remotes/git-svn SVN_TREE=$GIT_SVN_DIR/svn-tree +test_set_port SVNSERVE_PORT svn >/dev/null 2>&1 if test $? -ne 1 @@ -119,7 +120,6 @@ require_svnserve () { } start_svnserve () { - SVNSERVE_PORT=${SVNSERVE_PORT-${this_test#t}} svnserve --listen-port $SVNSERVE_PORT \ --root "$rawsvnrepo" \ --listen-once \ |