[PATCH] Makefile: tests should depend on mod_dontdothat

[Daniel Shahaf <d....@daniel.shahaf.name>]

authz_tests.py requires mod_dontdothat.

However, in a clean tree, «make davautocheck APACHE_MPM=event» fails
because mod_dontdothat isn't found:

[[[
% make -sj5 davautocheck APACHE_MPM=event
davautocheck.sh: Using '/usr/bin/apxs2'...
davautocheck.sh: dontdothat_module not found, please use '--enable-shared --with-apxs' with your 'configure' script                                                                                                
HTTPD stopped.
make: *** [Makefile:643: davautocheck] Error 1
zsh: exit 2     make -sj5 davautocheck APACHE_MPM=event
]]]

The fix seems straightforward, but could I please have a second pair of
eyes over it? —

[[[
* Makefile.in
  (davcheck, davautocheck): Depend on mod_dontdothat, which is required by authz_tests.

--- a/Makefile.in
+++ b/Makefile.in
@@ -638,12 +638,12 @@
 
 # First, set up Apache as documented in
 # subversion/tests/cmdline/README.
-davcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod
+davcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod mod_dontdothat
 	@$(MAKE) check BASE_URL=http://localhost
 
 # Automatically configure and run Apache httpd on a random port, and then
 # run make check.
-davautocheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod
+davautocheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod mod_dontdothat
 	@# Takes MODULE_PATH, USE_HTTPV1 and SVN_PATH_AUTHZ in the environment.
 	@APXS=$(APXS) MAKE=$(MAKE) $(SHELL) $(top_srcdir)/subversion/tests/cmdline/davautocheck.sh
 
]]]

Cheers,

Daniel

Re: [PATCH] Makefile: tests should depend on mod_dontdothat

[Daniel Sahlberg <da...@gmail.com>]

Den fre 16 juli 2021 kl 15:54 skrev Daniel Shahaf <d....@daniel.shahaf.name>:

> authz_tests.py requires mod_dontdothat.
>
> However, in a clean tree, «make davautocheck APACHE_MPM=event» fails
> because mod_dontdothat isn't found:
>
> [[[
> % make -sj5 davautocheck APACHE_MPM=event
> davautocheck.sh: Using '/usr/bin/apxs2'...
> davautocheck.sh: dontdothat_module not found, please use '--enable-shared
> --with-apxs' with your 'configure' script
>
> HTTPD stopped.
> make: *** [Makefile:643: davautocheck] Error 1
> zsh: exit 2     make -sj5 davautocheck APACHE_MPM=event
> ]]]
>
> The fix seems straightforward, but could I please have a second pair of
> eyes over it? —
>
> [[[
> * Makefile.in
>   (davcheck, davautocheck): Depend on mod_dontdothat, which is required by
> authz_tests.
>
> --- a/Makefile.in
> +++ b/Makefile.in
> @@ -638,12 +638,12 @@
>
>  # First, set up Apache as documented in
>  # subversion/tests/cmdline/README.
> -davcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod
> +davcheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod mod_dontdothat
>         @$(MAKE) check BASE_URL=http://localhost
>
>  # Automatically configure and run Apache httpd on a random port, and then
>  # run make check.
> -davautocheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod
> +davautocheck: bin $(TEST_DEPS) @BDB_TEST_DEPS@ apache-mod mod_dontdothat
>         @# Takes MODULE_PATH, USE_HTTPV1 and SVN_PATH_AUTHZ in the
> environment.
>         @APXS=$(APXS) MAKE=$(MAKE) $(SHELL)
> $(top_srcdir)/subversion/tests/cmdline/davautocheck.sh
>
> ]]]
>

I have checked this and I think it looks fine. Using current /trunk I can
reproduce the error

[[[
daniel@DESKTOP-DT42993:~/subversion$ make distclean && ./autogen.sh &&
'./configure'  '--enable-shared'
daniel@DESKTOP-DT42993:~/subversion$ make -j12 davautocheck APACHE_MPM=event
davautocheck.sh: Using '/usr/bin/apxs2'...
davautocheck.sh: dontdothat_module not found, please use '--enable-shared
--with-apxs' with your 'configure' script
HTTPD stopped.
make: *** [Makefile:648: davautocheck] Error 1
daniel@DESKTOP-DT42993:~/subversion$
]]]

(I initially spent quite some time not being able to reproduce it, because
I had a separate "make", which obviously built mod_dontdothat as part of
the tools target, so the error only manifests itself if running the
davautocheck right away).

With the patch above, the test starts as expected. (Well, almost. I'll
start a separate thread on that).

+1 from me.

Kind regards,
Daniel Sahlberg