From: Lars Schneider <[email protected]> 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 <[email protected]> --- .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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
