Changeset af7da2d in mod_gnutls for test/Makefile.am

Timestamp:

May 18, 2015, 1:31:17 AM (4 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

debian/master, debian/stretch-backports, jessie-backports, master, upstream

Children:

a2e3c33

Parents:

c5d5942

Message:

Test suite: Start Apache directly again, search for httpd

Fedora installs a version of apachectl that does not pass arguments
through to Apache and relies on the system wide configuration. Thus
running the test suite there requires calling the Apache binary
directly. Search for it as "apache2" (name used in Debian) as well as
"httpd" (Fedora).

Also include test/cgi_module.conf and test/proxy_mods.conf in the
distribution archive.

File:

• test/Makefile.am (modified) (2 diffs)

test/Makefile.am

@@ -61 +61 @@
 cert_templates = authority.template.in client.template.in \
         imposter.template.in rogueca.template server.template.in
-apache_data = base_apache.conf data/* mime.types
+apache_data = base_apache.conf cgi_module.conf data/* mime.types proxy_mods.conf
 
 EXTRA_DIST = $(apache_data) $(cert_templates) *.uid.in proxy_backend.bash \
@@ -67 +67 @@
         TestMakefile
 
-AM_TESTS_ENVIRONMENT = export APACHECTL=$(APACHECTL); \
+AM_TESTS_ENVIRONMENT = export APACHE2=$(APACHE2); \
         export AP_LIBEXECDIR=$(AP_LIBEXECDIR);