From: larsxschneider@gmail.com
To: git@vger.kernel.org
Cc: e@80x24.org, Lars Schneider <larsxschneider@gmail.com>
Subject: [PATCH v1 2/2] travis-ci: enable sequential test execution for t9113 and 9126
Date: Thu, 19 May 2016 11:10:09 +0200 [thread overview]
Message-ID: <1463649009-56941-3-git-send-email-larsxschneider@gmail.com> (raw)
In-Reply-To: <1463649009-56941-1-git-send-email-larsxschneider@gmail.com>
From: Lars Schneider <larsxschneider@gmail.com>
Enable t9113 and 9126 by defining the SVNSERVER_PORT. Since both tests
open the same port during execution, they cannot run in parallel. Add
a ".seq.sh" suffix to the test files and teach "prove" to run them
sequentially.
Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
---
.travis.yml | 3 ++-
...t-svn-dcommit-new-file.sh => t9113-git-svn-dcommit-new-file.seq.sh} | 0
...ectory.sh => t9126-git-svn-follow-deleted-readded-directory.seq.sh} | 0
3 files changed, 2 insertions(+), 1 deletion(-)
rename t/{t9113-git-svn-dcommit-new-file.sh => t9113-git-svn-dcommit-new-file.seq.sh} (100%)
rename t/{t9126-git-svn-follow-deleted-readded-directory.sh => t9126-git-svn-follow-deleted-readded-directory.seq.sh} (100%)
diff --git a/.travis.yml b/.travis.yml
index c20ec54..605ced1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -29,9 +29,10 @@ env:
- LINUX_P4_VERSION="16.1"
- LINUX_GIT_LFS_VERSION="1.2.0"
- DEFAULT_TEST_TARGET=prove
- - GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save"
+ - GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save --rules='seq=*.seq.*' --rules='par=**'"
- GIT_TEST_OPTS="--verbose --tee"
- GIT_TEST_CLONE_2GB=YesPlease
+ - SVNSERVE_PORT=3690
# t9810 occasionally fails on Travis CI OS X
# t9816 occasionally fails with "TAP out of sequence errors" on Travis CI OS X
- GIT_SKIP_TESTS="t9810 t9816"
diff --git a/t/t9113-git-svn-dcommit-new-file.sh b/t/t9113-git-svn-dcommit-new-file.seq.sh
similarity index 100%
rename from t/t9113-git-svn-dcommit-new-file.sh
rename to t/t9113-git-svn-dcommit-new-file.seq.sh
diff --git a/t/t9126-git-svn-follow-deleted-readded-directory.sh b/t/t9126-git-svn-follow-deleted-readded-directory.seq.sh
similarity index 100%
rename from t/t9126-git-svn-follow-deleted-readded-directory.sh
rename to t/t9126-git-svn-follow-deleted-readded-directory.seq.sh
--
2.5.1
next prev parent reply other threads:[~2016-05-19 9:10 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-19 9:10 [PATCH v1 0/2] travis-ci: enable Git SVN tests larsxschneider
2016-05-19 9:10 ` [PATCH v1 1/2] travis-ci: enable Git SVN tests t91xx on Linux larsxschneider
2016-05-19 9:10 ` larsxschneider [this message]
2016-05-19 10:06 ` [PATCH v1 2/2] travis-ci: enable sequential test execution for t9113 and 9126 Eric Wong
2016-05-19 17:11 ` Junio C Hamano
2016-05-22 10:10 ` Lars Schneider
2016-05-22 20:26 ` Eric Wong
2016-05-23 21:22 ` Junio C Hamano
2016-05-23 21:32 ` Eric Wong
2016-05-23 21:47 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1463649009-56941-3-git-send-email-larsxschneider@gmail.com \
--to=larsxschneider@gmail.com \
--cc=e@80x24.org \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).