* [PATCH v1 0/2] travis-ci: enable Git SVN tests
@ 2016-05-19 9:10 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 ` [PATCH v1 2/2] travis-ci: enable sequential test execution for t9113 and 9126 larsxschneider
0 siblings, 2 replies; 10+ messages in thread
From: larsxschneider @ 2016-05-19 9:10 UTC (permalink / raw)
To: git; +Cc: e, Lars Schneider
From: Lars Schneider <larsxschneider@gmail.com>
Hi,
this mini series enables SVN tests on Linux. Installing the Perl SVN libraries
was not that straight forward on OSX and therefore I skipped it (plus the OS X
tests take quite some time already).
The most notable change is the rename of two SVN test cases. I did that to
identify tests that need to run sequentially using prove [1]. Is this an
acceptable pattern? If yes, then I will document it in t/README.
Thanks,
Lars
[1] https://github.com/Perl-Toolchain-Gang/Test-Harness/pull/5
Lars Schneider (2):
travis-ci: enable Git SVN tests t91xx on Linux
travis-ci: enable sequential test execution for t9113 and 9126
.travis.yml | 4 +++-
...-svn-dcommit-new-file.sh => t9113-git-svn-dcommit-new-file.seq.sh} | 0
...ctory.sh => t9126-git-svn-follow-deleted-readded-directory.seq.sh} | 0
3 files changed, 3 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%)
--
2.5.1
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v1 1/2] travis-ci: enable Git SVN tests t91xx on Linux
2016-05-19 9:10 [PATCH v1 0/2] travis-ci: enable Git SVN tests larsxschneider
@ 2016-05-19 9:10 ` larsxschneider
2016-05-19 9:10 ` [PATCH v1 2/2] travis-ci: enable sequential test execution for t9113 and 9126 larsxschneider
1 sibling, 0 replies; 10+ messages in thread
From: larsxschneider @ 2016-05-19 9:10 UTC (permalink / raw)
To: git; +Cc: e, Lars Schneider
From: Lars Schneider <larsxschneider@gmail.com>
Install the "git-svn" package to make the Perl SVN libraries available
to the Git SVN tests on Travis-CI Linux build machines.
Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
---
.travis.yml | 1 +
1 file changed, 1 insertion(+)
diff --git a/.travis.yml b/.travis.yml
index adab5b8..c20ec54 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,6 +18,7 @@ addons:
apt:
packages:
- language-pack-is
+ - git-svn
env:
global:
--
2.5.1
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v1 2/2] travis-ci: enable sequential test execution for t9113 and 9126
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
2016-05-19 10:06 ` Eric Wong
1 sibling, 1 reply; 10+ messages in thread
From: larsxschneider @ 2016-05-19 9:10 UTC (permalink / raw)
To: git; +Cc: e, Lars Schneider
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
^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v1 2/2] travis-ci: enable sequential test execution for t9113 and 9126
2016-05-19 9:10 ` [PATCH v1 2/2] travis-ci: enable sequential test execution for t9113 and 9126 larsxschneider
@ 2016-05-19 10:06 ` Eric Wong
2016-05-19 17:11 ` Junio C Hamano
0 siblings, 1 reply; 10+ messages in thread
From: Eric Wong @ 2016-05-19 10:06 UTC (permalink / raw)
To: larsxschneider; +Cc: git
larsxschneider@gmail.com wrote:
> 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.
Interesting, I guess I forgot the problem because had some
rules in config.mak to serialize them for many years, now :x
Anyways, how about making the tests run on separate ports and
not worry about serializing them at all? Maybe there was a
reason we didn't do this years ago, but I forget...
But probably the best (but I guess more difficult) option is to
get svnserve+apache to do socket activation off a random port
bound by a parent process at startup.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v1 2/2] travis-ci: enable sequential test execution for t9113 and 9126
2016-05-19 10:06 ` Eric Wong
@ 2016-05-19 17:11 ` Junio C Hamano
2016-05-22 10:10 ` Lars Schneider
0 siblings, 1 reply; 10+ messages in thread
From: Junio C Hamano @ 2016-05-19 17:11 UTC (permalink / raw)
To: Eric Wong; +Cc: larsxschneider, git
Eric Wong <e@80x24.org> writes:
> Anyways, how about making the tests run on separate ports and
> not worry about serializing them at all?
Yeah, that does sound like a more sensible approach.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v1 2/2] travis-ci: enable sequential test execution for t9113 and 9126
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
0 siblings, 2 replies; 10+ messages in thread
From: Lars Schneider @ 2016-05-22 10:10 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Eric Wong, git
> On 19 May 2016, at 19:11, Junio C Hamano <gitster@pobox.com> wrote:
>
> Eric Wong <e@80x24.org> writes:
>
>> Anyways, how about making the tests run on separate ports and
>> not worry about serializing them at all?
>
> Yeah, that does sound like a more sensible approach.
Makes sense. However, it's not something I will tackle soon.
Would you be willing to pick up $gmane/295048 (the first patch) as is
and drop $gmane/295050 (the patch discussed here)? Then the majority
of Git SVN tests would run on Travis CI.
Thanks,
Lars
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v1 2/2] travis-ci: enable sequential test execution for t9113 and 9126
2016-05-22 10:10 ` Lars Schneider
@ 2016-05-22 20:26 ` Eric Wong
2016-05-23 21:22 ` Junio C Hamano
1 sibling, 0 replies; 10+ messages in thread
From: Eric Wong @ 2016-05-22 20:26 UTC (permalink / raw)
To: Lars Schneider, Junio C Hamano; +Cc: git
Lars Schneider <larsxschneider@gmail.com> wrote:
> > On 19 May 2016, at 19:11, Junio C Hamano <gitster@pobox.com> wrote:
> > Eric Wong <e@80x24.org> writes:
> >
> >> Anyways, how about making the tests run on separate ports and
> >> not worry about serializing them at all?
> >
> > Yeah, that does sound like a more sensible approach.
>
> Makes sense. However, it's not something I will tackle soon.
> Would you be willing to pick up $gmane/295048 (the first patch) as is
> and drop $gmane/295050 (the patch discussed here)? Then the majority
> of Git SVN tests would run on Travis CI.
Sure, patch 1/2 is signed-off and pushed to my repo. Thanks.
I'll try to take a look at parallelizing the other tests instead
of marking them sequential some other time.
Junio:
The following changes since commit 3916adf9978b020f9a9b165f4c1c109046899560:
Sync with 2.8.3 (2016-05-18 15:33:57 -0700)
are available in the git repository at:
git://bogomips.org/git-svn.git svn-travis
for you to fetch changes up to e7e9f5e7a1d39bf210c59428cd2a98f0a6abba0b:
travis-ci: enable Git SVN tests t91xx on Linux (2016-05-22 20:20:28 +0000)
----------------------------------------------------------------
Lars Schneider (1):
travis-ci: enable Git SVN tests t91xx on Linux
.travis.yml | 1 +
1 file changed, 1 insertion(+)
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v1 2/2] travis-ci: enable sequential test execution for t9113 and 9126
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
1 sibling, 1 reply; 10+ messages in thread
From: Junio C Hamano @ 2016-05-23 21:22 UTC (permalink / raw)
To: Lars Schneider; +Cc: Eric Wong, git
Lars Schneider <larsxschneider@gmail.com> writes:
>> On 19 May 2016, at 19:11, Junio C Hamano <gitster@pobox.com> wrote:
>>
>> Eric Wong <e@80x24.org> writes:
>>
>>> Anyways, how about making the tests run on separate ports and
>>> not worry about serializing them at all?
>>
>> Yeah, that does sound like a more sensible approach.
>
> Makes sense. However, it's not something I will tackle soon.
> Would you be willing to pick up $gmane/295048 (the first patch) as is
> and drop $gmane/295050 (the patch discussed here)? Then the majority
> of Git SVN tests would run on Travis CI.
I am not sure if adding git-svn alone would be a good change.
Wouldn't it invite false failures from running these conflicting
tests at the same time?
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v1 2/2] travis-ci: enable sequential test execution for t9113 and 9126
2016-05-23 21:22 ` Junio C Hamano
@ 2016-05-23 21:32 ` Eric Wong
2016-05-23 21:47 ` Junio C Hamano
0 siblings, 1 reply; 10+ messages in thread
From: Eric Wong @ 2016-05-23 21:32 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Lars Schneider, git
Junio C Hamano <gitster@pobox.com> wrote:
> Lars Schneider <larsxschneider@gmail.com> writes:
> >> On 19 May 2016, at 19:11, Junio C Hamano <gitster@pobox.com> wrote:
> >> Eric Wong <e@80x24.org> writes:
> >>
> >>> Anyways, how about making the tests run on separate ports and
> >>> not worry about serializing them at all?
> >>
> >> Yeah, that does sound like a more sensible approach.
> >
> > Makes sense. However, it's not something I will tackle soon.
> > Would you be willing to pick up $gmane/295048 (the first patch) as is
> > and drop $gmane/295050 (the patch discussed here)? Then the majority
> > of Git SVN tests would run on Travis CI.
>
> I am not sure if adding git-svn alone would be a good change.
> Wouldn't it invite false failures from running these conflicting
> tests at the same time?
The problematic tests won't run unless *_PORT variables are set;
which AFAIK they aren't, yet.
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v1 2/2] travis-ci: enable sequential test execution for t9113 and 9126
2016-05-23 21:32 ` Eric Wong
@ 2016-05-23 21:47 ` Junio C Hamano
0 siblings, 0 replies; 10+ messages in thread
From: Junio C Hamano @ 2016-05-23 21:47 UTC (permalink / raw)
To: Eric Wong; +Cc: Lars Schneider, git
Eric Wong <e@80x24.org> writes:
> Junio C Hamano <gitster@pobox.com> wrote:
>> Lars Schneider <larsxschneider@gmail.com> writes:
>> >> On 19 May 2016, at 19:11, Junio C Hamano <gitster@pobox.com> wrote:
>> >> Eric Wong <e@80x24.org> writes:
>> >>
>> >>> Anyways, how about making the tests run on separate ports and
>> >>> not worry about serializing them at all?
>> >>
>> >> Yeah, that does sound like a more sensible approach.
>> >
>> > Makes sense. However, it's not something I will tackle soon.
>> > Would you be willing to pick up $gmane/295048 (the first patch) as is
>> > and drop $gmane/295050 (the patch discussed here)? Then the majority
>> > of Git SVN tests would run on Travis CI.
>>
>> I am not sure if adding git-svn alone would be a good change.
>> Wouldn't it invite false failures from running these conflicting
>> tests at the same time?
>
> The problematic tests won't run unless *_PORT variables are set;
> which AFAIK they aren't, yet.
Ahh, OK that is perfect.
Thanks!
^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2016-05-23 21:47 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 ` [PATCH v1 2/2] travis-ci: enable sequential test execution for t9113 and 9126 larsxschneider
2016-05-19 10:06 ` 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
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).