Changeset 7813802 in mod_gnutls


Ignore:
Timestamp:
May 16, 2015, 7:07:34 AM (4 years ago)
Author:
Thomas Klute <thomas2.klute@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports, master, upstream
Children:
f71e6ce
Parents:
52c3f68
Message:

Test suite: Use AP_LIBEXECDIR to find Apache modules

Distributions install Apache modules to different locations, so hard
coded paths will cause problems. Use the module directory detected by
./configure instead.

Location:
test
Files:
2 added
12 edited

Legend:

Unmodified
Added
Removed
  • test/Makefile.am

    r52c3f68 r7813802  
    6767        TestMakefile
    6868
    69 AM_TESTS_ENVIRONMENT = export APACHECTL=$(APACHECTL);
     69AM_TESTS_ENVIRONMENT = export APACHECTL=$(APACHECTL); \
     70        export AP_LIBEXECDIR=$(AP_LIBEXECDIR);
  • test/README

    r52c3f68 r7813802  
    1616 make check
    1717
    18 from test/ you can also run specific tests (identified by number) with:
     18from test/ you can also run specific tests by passing their script
     19names to make in the TESTS variable:
    1920
    20  make -f TestMakefile t-3
     21 TESTS="test-03_cachetimeout_in_vhost.bash" make -e check
    2122
    2223This should be handy when you're just trying to experiment with a new
  • test/base_apache.conf

    r52c3f68 r7813802  
    88KeepAlive Off
    99LogLevel debug
    10 LoadModule mpm_worker_module /usr/lib/apache2/modules/mod_mpm_worker.so
    11 LoadModule authn_core_module /usr/lib/apache2/modules/mod_authn_core.so
    12 LoadModule authz_core_module /usr/lib/apache2/modules/mod_authz_core.so
    13 LoadModule mime_module /usr/lib/apache2/modules/mod_mime.so
     10LoadModule      mpm_worker_module       ${AP_LIBEXECDIR}/mod_mpm_worker.so
     11LoadModule      authn_core_module       ${AP_LIBEXECDIR}/mod_authn_core.so
     12LoadModule      authz_core_module       ${AP_LIBEXECDIR}/mod_authz_core.so
     13LoadModule      mime_module             ${AP_LIBEXECDIR}/mod_mime.so
    1414TypesConfig ${srcdir}/mime.types
    1515
  • test/tests/12_cgi_variables/apache.conf

    r52c3f68 r7813802  
    11Include ${srcdir}/base_apache.conf
    2 
    3 LoadModule cgi_module /usr/lib/apache2/modules/mod_cgi.so
    4 
    5 AddHandler cgi-script .cgi
     2Include ${srcdir}/cgi_module.conf
    63
    74GnuTLSCache dbm cache/gnutls_cache
  • test/tests/13_cgi_variables_no_client_cert/apache.conf

    r52c3f68 r7813802  
    11Include ${srcdir}/base_apache.conf
    2 
    3 LoadModule cgi_module /usr/lib/apache2/modules/mod_cgi.so
    4 
    5 AddHandler cgi-script .cgi
     2Include ${srcdir}/cgi_module.conf
    63
    74GnuTLSCache dbm cache/gnutls_cache
  • test/tests/16_view-status/apache.conf

    r52c3f68 r7813802  
    11Include ${srcdir}/base_apache.conf
    22
    3 LoadModule status_module /usr/lib/apache2/modules/mod_status.so
     3LoadModule      status_module   ${AP_LIBEXECDIR}/mod_status.so
    44<Location /status>
    55    SetHandler server-status
  • test/tests/17_cgi_vars_large_cert/apache.conf

    r52c3f68 r7813802  
    11Include ${srcdir}/base_apache.conf
    2 
    3 LoadModule cgi_module /usr/lib/apache2/modules/mod_cgi.so
    4 
    5 AddHandler cgi-script .cgi
     2Include ${srcdir}/cgi_module.conf
    63
    74GnuTLSCache dbm cache/gnutls_cache
  • test/tests/19_TLS_reverse_proxy/apache.conf

    r52c3f68 r7813802  
    11Include ${srcdir}/base_apache.conf
     2Include ${srcdir}/proxy_mods.conf
    23
    34GnuTLSCache dbm cache/gnutls_cache
    4 
    5 LoadModule proxy_module /usr/lib/apache2/modules/mod_proxy.so
    6 LoadModule proxy_http_module /usr/lib/apache2/modules/mod_proxy_http.so
    75
    86<VirtualHost ${TEST_IP}:${TEST_PORT}>
  • test/tests/20_TLS_reverse_proxy_client_auth/apache.conf

    r52c3f68 r7813802  
    11Include ${srcdir}/base_apache.conf
     2Include ${srcdir}/proxy_mods.conf
    23
    34GnuTLSCache dbm cache/gnutls_cache
    4 
    5 LoadModule proxy_module /usr/lib/apache2/modules/mod_proxy.so
    6 LoadModule proxy_http_module /usr/lib/apache2/modules/mod_proxy_http.so
    75
    86<VirtualHost ${TEST_IP}:${TEST_PORT}>
  • test/tests/21_TLS_reverse_proxy_wrong_cert/apache.conf

    r52c3f68 r7813802  
    11Include ${srcdir}/base_apache.conf
     2Include ${srcdir}/proxy_mods.conf
    23
    34GnuTLSCache dbm cache/gnutls_cache
    4 
    5 LoadModule proxy_module /usr/lib/apache2/modules/mod_proxy.so
    6 LoadModule proxy_http_module /usr/lib/apache2/modules/mod_proxy_http.so
    75
    86<VirtualHost ${TEST_IP}:${TEST_PORT}>
  • test/tests/22_TLS_reverse_proxy_crl_revoke/apache.conf

    r52c3f68 r7813802  
    11Include ${srcdir}/base_apache.conf
     2Include ${srcdir}/proxy_mods.conf
    23
    34GnuTLSCache dbm cache/gnutls_cache
    4 
    5 LoadModule proxy_module /usr/lib/apache2/modules/mod_proxy.so
    6 LoadModule proxy_http_module /usr/lib/apache2/modules/mod_proxy_http.so
    75
    86<VirtualHost ${TEST_IP}:${TEST_PORT}>
  • test/tests/23_TLS_reverse_proxy_mismatched_priorities/apache.conf

    r52c3f68 r7813802  
    11Include ${srcdir}/base_apache.conf
     2Include ${srcdir}/proxy_mods.conf
    23
    34GnuTLSCache dbm cache/gnutls_cache
    4 
    5 LoadModule proxy_module /usr/lib/apache2/modules/mod_proxy.so
    6 LoadModule proxy_http_module /usr/lib/apache2/modules/mod_proxy_http.so
    75
    86<VirtualHost ${TEST_IP}:${TEST_PORT}>
Note: See TracChangeset for help on using the changeset viewer.