You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by Daniel Shahaf <d....@daniel.shahaf.name> on 2019/09/01 00:16:59 UTC
[PATCH] test-deps += svnmover
In current master, «./autogen.sh && ./configure && make davautocheck» fails all svnmover tests.
I think the following will fix it, but haven't verified:
Index: build/generator/gen_base.py
===================================================================
--- build/generator/gen_base.py (revision 1866222)
+++ build/generator/gen_base.py (working copy)
@@ -663,7 +663,7 @@ class TargetExe(TargetLinked):
TargetLinked.add_dependencies(self)
# collect test programs
- if 'svnauthz' in self.name: # special case
+ if 'svnauthz' in self.name or 'svnmover' in self.name: # special case
self.gen_obj.test_deps.append(self.filename)
self.gen_obj.test_helpers.append(self.filename)
elif self.install == 'test':
Could someone please verify/commit?
Thanks,
Daniel
Re: [PATCH] test-deps += svnmover
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
Julian Foad wrote on Mon, 02 Sep 2019 14:23 +00:00:
> Daniel Shahaf wrote:
> > In current master, «./autogen.sh && ./configure && make davautocheck» fails all svnmover tests.
>
> By default, 'make davautocheck' expects to find
> 'tools/server-side/mod_dontdothat' has already been built; my first
Sorry, my bad. I had run into the issue with svnserveautocheck, not davautocheck.
> reaction then was to run 'make tools' which builds that and also builds
> 'svnmover', and the tests pass; but if I instead run 'make
> mod_dontdothat' then I see the problem.
This sounds like an independent (but related) bug.
> Verified and committed: http://svn.apache.org/r1866281
>
> Thanks for finding that.
Thanks for verifying and fixing.
Cheers,
Daniel
Re: [PATCH] test-deps += svnmover
Posted by Daniel Shahaf <d....@daniel.shahaf.name>.
Bert Huijben wrote on Thu, 05 Sep 2019 11:45 +00:00:
> I think it can just be added to the [__ALL_TESTS__] group instead of
> hardcoding it in python.
That wouldn't add it to the test-deps target.
> svnauthz is probably an exception as it is related to a symlink.
svnauthz is not a symlink. It's an exception because it's install=tools, not install=test.
> Why can't this be fixed via the build.conf file?
Well, we _could_ add a new key or value and check it in addition to
testing «self.install == 'test'», of course... Maybe when there's a third exception :)
(Oh, wait. mod_dontdothat would be the third exception, wouldn't it?)
Cheers,
Daniel
Re: [PATCH] test-deps += svnmover
Posted by Bert Huijben <be...@qqmail.nl>.
Why can't this be fixed via the build.conf file?
I think it can just be added to the [__ALL_TESTS__] group instead of
hardcoding it in python. svnauthz is probably an exception as it is related
to a symlink.
Bert
On Mon, Sep 2, 2019 at 4:24 PM Julian Foad <ju...@apache.org> wrote:
> Daniel Shahaf wrote:
> > In current master, «./autogen.sh && ./configure && make davautocheck»
> fails all svnmover tests.
>
> By default, 'make davautocheck' expects to find
> 'tools/server-side/mod_dontdothat' has already been built; my first
> reaction then was to run 'make tools' which builds that and also builds
> 'svnmover', and the tests pass; but if I instead run 'make
> mod_dontdothat' then I see the problem.
>
> > make davautocheck
> > I think the following will fix it, but haven't verified:
> >
> > Index: build/generator/gen_base.py
> > ===================================================================
> > --- build/generator/gen_base.py (revision 1866222)
> > +++ build/generator/gen_base.py (working copy)
> > @@ -663,7 +663,7 @@ class TargetExe(TargetLinked):
> > TargetLinked.add_dependencies(self)
> >
> > # collect test programs
> > - if 'svnauthz' in self.name: # special case
> > + if 'svnauthz' in self.name or 'svnmover' in self.name: # special
> case
> > self.gen_obj.test_deps.append(self.filename)
> > self.gen_obj.test_helpers.append(self.filename)
> > elif self.install == 'test':
> >
> > Could someone please verify/commit?
>
> Verified and committed: http://svn.apache.org/r1866281
>
> Thanks for finding that.
>
> - Julian
>
>
>
Re: [PATCH] test-deps += svnmover
Posted by Julian Foad <ju...@apache.org>.
Daniel Shahaf wrote:
> In current master, «./autogen.sh && ./configure && make davautocheck» fails all svnmover tests.
By default, 'make davautocheck' expects to find
'tools/server-side/mod_dontdothat' has already been built; my first
reaction then was to run 'make tools' which builds that and also builds
'svnmover', and the tests pass; but if I instead run 'make
mod_dontdothat' then I see the problem.
> make davautocheck
> I think the following will fix it, but haven't verified:
>
> Index: build/generator/gen_base.py
> ===================================================================
> --- build/generator/gen_base.py (revision 1866222)
> +++ build/generator/gen_base.py (working copy)
> @@ -663,7 +663,7 @@ class TargetExe(TargetLinked):
> TargetLinked.add_dependencies(self)
>
> # collect test programs
> - if 'svnauthz' in self.name: # special case
> + if 'svnauthz' in self.name or 'svnmover' in self.name: # special case
> self.gen_obj.test_deps.append(self.filename)
> self.gen_obj.test_helpers.append(self.filename)
> elif self.install == 'test':
>
> Could someone please verify/commit?
Verified and committed: http://svn.apache.org/r1866281
Thanks for finding that.
- Julian