Changeset 33af2b7 in mod_gnutls for test/tests

Timestamp:

May 11, 2015, 6:28:20 PM (8 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

asyncio, debian/master, debian/stretch-backports, jessie-backports, main, master, proxy-ticket, upstream

Children:

31caead

Parents:

e24eed68

git-author:

Thomas Klute <thomas2.klute@…> (05/11/15 18:12:28)

git-committer:

Thomas Klute <thomas2.klute@…> (05/11/15 18:28:20)

Message:

Test suite: Add tests to "dist" target and support VPATH builds

Supporting VPATH builds requires using $srcdir to find non-generated
data rather than fixed relative paths. If test are not called through
the make system, local defaults must be used. Not changing directories
during tests any more makes this easier.

A few files (e.g. templates, generated CRL) have been moved around to
better match the new structure.

Location:

test/tests

Files:

• 00_basic/apache.conf (modified) (1 diff)
• 00_basic/gnutls-cli.args (modified) (1 diff)
• 01_serverwide_priorities/apache.conf (modified) (1 diff)
• 01_serverwide_priorities/gnutls-cli.args (modified) (1 diff)
• 02_cache_in_vhost/apache.conf (modified) (1 diff)
• 02_cache_in_vhost/gnutls-cli.args (modified) (1 diff)
• 03_cachetimeout_in_vhost/apache.conf (modified) (1 diff)
• 03_cachetimeout_in_vhost/gnutls-cli.args (modified) (1 diff)
• 04_basic_nosni/apache.conf (modified) (1 diff)
• 04_basic_nosni/gnutls-cli.args (modified) (1 diff)
• 05_mismatched-priorities/apache.conf (modified) (1 diff)
• 05_mismatched-priorities/gnutls-cli.args (modified) (1 diff)
• 06_verify_sni_a/apache.conf (modified) (1 diff)
• 06_verify_sni_a/gnutls-cli.args (modified) (1 diff)
• 07_verify_sni_b/apache.conf (modified) (1 diff)
• 07_verify_sni_b/gnutls-cli.args (modified) (1 diff)
• 08_verify_no_sni_fallback_to_first_vhost/apache.conf (modified) (1 diff)
• 08_verify_no_sni_fallback_to_first_vhost/gnutls-cli.args (modified) (1 diff)
• 09_verify_no_sni_fails_with_wrong_order/apache.conf (modified) (1 diff)
• 09_verify_no_sni_fails_with_wrong_order/gnutls-cli.args (modified) (1 diff)
• 10_basic_client_verification/apache.conf (modified) (1 diff)
• 10_basic_client_verification/gnutls-cli.args (modified) (1 diff)
• 11_basic_client_verification_fail/apache.conf (modified) (1 diff)
• 11_basic_client_verification_fail/gnutls-cli.args (modified) (1 diff)
• 12_cgi_variables/apache.conf (modified) (2 diffs)
• 12_cgi_variables/gnutls-cli.args (modified) (1 diff)
• 13_cgi_variables_no_client_cert/apache.conf (modified) (2 diffs)
• 13_cgi_variables_no_client_cert/gnutls-cli.args (modified) (1 diff)
• 14_basic_openpgp/apache.conf (modified) (1 diff)
• 14_basic_openpgp/gnutls-cli.args (modified) (1 diff)
• 15_basic_msva/apache.conf (modified) (1 diff)
• 15_basic_msva/gnutls-cli.args (modified) (1 diff)
• 16_view-status/apache.conf (modified) (1 diff)
• 16_view-status/gnutls-cli.args (modified) (1 diff)
• 17_cgi_vars_large_cert/apache.conf (modified) (2 diffs)
• 17_cgi_vars_large_cert/gnutls-cli.args (modified) (1 diff)
• 18_client_verification_wrong_cert/apache.conf (modified) (1 diff)
• 18_client_verification_wrong_cert/gnutls-cli.args (modified) (1 diff)
• 19_TLS_reverse_proxy/apache.conf (modified) (1 diff)
• 19_TLS_reverse_proxy/backend.conf (modified) (1 diff)
• 19_TLS_reverse_proxy/gnutls-cli.args (modified) (1 diff)
• 20_TLS_reverse_proxy_client_auth/apache.conf (modified) (1 diff)
• 20_TLS_reverse_proxy_client_auth/backend.conf (modified) (1 diff)
• 20_TLS_reverse_proxy_client_auth/gnutls-cli.args (modified) (1 diff)
• 21_TLS_reverse_proxy_wrong_cert/apache.conf (modified) (1 diff)
• 21_TLS_reverse_proxy_wrong_cert/backend.conf (modified) (1 diff)
• 21_TLS_reverse_proxy_wrong_cert/gnutls-cli.args (modified) (1 diff)
• 22_TLS_reverse_proxy_crl_revoke/apache.conf (modified) (2 diffs)
• 22_TLS_reverse_proxy_crl_revoke/backend.conf (modified) (1 diff)
• 22_TLS_reverse_proxy_crl_revoke/gnutls-cli.args (modified) (1 diff)
• 23_TLS_reverse_proxy_mismatched_priorities/apache.conf (modified) (1 diff)
• 23_TLS_reverse_proxy_mismatched_priorities/backend.conf (modified) (1 diff)
• 23_TLS_reverse_proxy_mismatched_priorities/gnutls-cli.args (modified) (1 diff)
• 24_pkcs11_cert/apache.conf (modified) (1 diff)
• 24_pkcs11_cert/gnutls-cli.args (modified) (1 diff)
• 24_pkcs11_cert/softhsm.conf.in (modified) (1 diff)
• Makefile.am (added)

test/tests/00_basic/apache.conf

@@ -1 @@
-Include ${PWD}/../../base_apache.conf
+Include ${srcdir}/base_apache.conf
 
 GnuTLSCache dbm cache/gnutls_cache

test/tests/00_basic/gnutls-cli.args

@@ -1 @@
---x509cafile=../../authority/x509.pem
+--x509cafile=authority/x509.pem
 --priority=NORMAL

test/tests/01_serverwide_priorities/apache.conf

@@ -1 @@
-Include ${PWD}/../../base_apache.conf
+Include ${srcdir}/base_apache.conf
 
 GnuTLSCache dbm cache/gnutls_cache

test/tests/01_serverwide_priorities/gnutls-cli.args

@@ -1 @@
---x509cafile=../../authority/x509.pem
+--x509cafile=authority/x509.pem
 --priority=NORMAL

test/tests/02_cache_in_vhost/apache.conf

@@ -1 @@
-Include ${PWD}/../../base_apache.conf
+Include ${srcdir}/base_apache.conf
 
 <VirtualHost ${TEST_IP}:${TEST_PORT}>

test/tests/02_cache_in_vhost/gnutls-cli.args

@@ -1 @@
---x509cafile=../../authority/x509.pem
+--x509cafile=authority/x509.pem
 --priority=NORMAL

test/tests/03_cachetimeout_in_vhost/apache.conf

@@ -1 @@
-Include ${PWD}/../../base_apache.conf
+Include ${srcdir}/base_apache.conf
 
 <VirtualHost ${TEST_IP}:${TEST_PORT}>

test/tests/03_cachetimeout_in_vhost/gnutls-cli.args

@@ -1 @@
---x509cafile=../../authority/x509.pem
+--x509cafile=authority/x509.pem
 --priority=NORMAL

test/tests/04_basic_nosni/apache.conf

@@ -1 @@
-Include ${PWD}/../../base_apache.conf
+Include ${srcdir}/base_apache.conf
 
 GnuTLSCache dbm cache/gnutls_cache

test/tests/04_basic_nosni/gnutls-cli.args

@@ -1 @@
---x509cafile=../../authority/x509.pem
+--x509cafile=authority/x509.pem
 --priority=NORMAL
 --disable-extensions

test/tests/05_mismatched-priorities/apache.conf

@@ -1 @@
-Include ${PWD}/../../base_apache.conf
+Include ${srcdir}/base_apache.conf
 
 GnuTLSCache dbm cache/gnutls_cache

test/tests/05_mismatched-priorities/gnutls-cli.args

@@ -1 @@
---x509cafile=../../authority/x509.pem
+--x509cafile=authority/x509.pem
 --priority=NORMAL:-VERS-TLS-ALL:+VERS-SSL3.0

test/tests/06_verify_sni_a/apache.conf

@@ -1 @@
-Include ${PWD}/../../base_apache.conf
+Include ${srcdir}/base_apache.conf
 
 GnuTLSCache dbm cache/gnutls_cache

test/tests/06_verify_sni_a/gnutls-cli.args

@@ -1 @@
---x509cafile=../../authority/x509.pem
+--x509cafile=authority/x509.pem
 --priority=NORMAL

test/tests/07_verify_sni_b/apache.conf

@@ -1 @@
-Include ${PWD}/../../base_apache.conf
+Include ${srcdir}/base_apache.conf
 
 GnuTLSCache dbm cache/gnutls_cache

test/tests/07_verify_sni_b/gnutls-cli.args

@@ -1 @@
---x509cafile=../../authority/x509.pem
+--x509cafile=authority/x509.pem
 --priority=NORMAL

test/tests/08_verify_no_sni_fallback_to_first_vhost/apache.conf

@@ -1 @@
-Include ${PWD}/../../base_apache.conf
+Include ${srcdir}/base_apache.conf
 
 GnuTLSCache dbm cache/gnutls_cache

test/tests/08_verify_no_sni_fallback_to_first_vhost/gnutls-cli.args

@@ -1 +1 @@
 --disable-extensions
---x509cafile=../../authority/x509.pem
+--x509cafile=authority/x509.pem
 --priority=NORMAL

test/tests/09_verify_no_sni_fails_with_wrong_order/apache.conf

@@ -1 @@
-Include ${PWD}/../../base_apache.conf
+Include ${srcdir}/base_apache.conf
 
 GnuTLSCache dbm cache/gnutls_cache

test/tests/09_verify_no_sni_fails_with_wrong_order/gnutls-cli.args

@@ -1 +1 @@
 --disable-extensions
---x509cafile=../../authority/x509.pem
+--x509cafile=authority/x509.pem
 --priority=NORMAL

test/tests/10_basic_client_verification/apache.conf

@@ -1 @@
-Include ${PWD}/../../base_apache.conf
+Include ${srcdir}/base_apache.conf
 
 GnuTLSCache dbm cache/gnutls_cache

test/tests/10_basic_client_verification/gnutls-cli.args

@@ -1 @@
---x509certfile=../../client/x509.pem
---x509keyfile=../../client/secret.key
---x509cafile=../../authority/x509.pem
+--x509certfile=client/x509.pem
+--x509keyfile=client/secret.key
+--x509cafile=authority/x509.pem
 --priority=NORMAL

test/tests/11_basic_client_verification_fail/apache.conf

@@ -1 @@
-Include ${PWD}/../../base_apache.conf
+Include ${srcdir}/base_apache.conf
 
 GnuTLSCache dbm cache/gnutls_cache

test/tests/11_basic_client_verification_fail/gnutls-cli.args

@@ -1 @@
---x509cafile=../../authority/x509.pem
+--x509cafile=authority/x509.pem
 --priority=NORMAL

test/tests/12_cgi_variables/apache.conf

@@ -1 @@
-Include ${PWD}/../../base_apache.conf
+Include ${srcdir}/base_apache.conf
 
 LoadModule cgi_module /usr/lib/apache2/modules/mod_cgi.so
@@ -7 +7 @@
 GnuTLSCache dbm cache/gnutls_cache
 
-<Directory ${PWD}/../../data>
+<Directory ${srcdir}/data>
  Options +ExecCGI
 </Directory>

test/tests/12_cgi_variables/gnutls-cli.args

@@ -1 @@
---x509certfile=../../client/x509.pem
---x509keyfile=../../client/secret.key
---x509cafile=../../authority/x509.pem
+--x509certfile=client/x509.pem
+--x509keyfile=client/secret.key
+--x509cafile=authority/x509.pem
 --priority=NORMAL:-KX-ALL:+DHE-RSA

test/tests/13_cgi_variables_no_client_cert/apache.conf

@@ -1 @@
-Include ${PWD}/../../base_apache.conf
+Include ${srcdir}/base_apache.conf
 
 LoadModule cgi_module /usr/lib/apache2/modules/mod_cgi.so
@@ -7 +7 @@
 GnuTLSCache dbm cache/gnutls_cache
 
-<Directory ${PWD}/../../data>
+<Directory ${srcdir}/data>
  Options +ExecCGI
 </Directory>

test/tests/13_cgi_variables_no_client_cert/gnutls-cli.args

@@ -1 @@
---x509cafile=../../authority/x509.pem
+--x509cafile=authority/x509.pem
 --priority=NORMAL

test/tests/14_basic_openpgp/apache.conf

@@ -1 @@
-Include ${PWD}/../../base_apache.conf
+Include ${srcdir}/base_apache.conf
 
 GnuTLSCache dbm cache/gnutls_cache

test/tests/14_basic_openpgp/gnutls-cli.args

@@ -1 @@
---pgpkeyring=../../authority/cert.pgp
+--pgpkeyring=authority/cert.pgp
 --priority=NORMAL:-CTYPE-X509:+CTYPE-OPENPGP:+CTYPE-X509

test/tests/15_basic_msva/apache.conf

@@ -1 @@
-Include ${PWD}/../../base_apache.conf
+Include ${srcdir}/base_apache.conf
 
 GnuTLSCache dbm cache/gnutls_cache

test/tests/15_basic_msva/gnutls-cli.args

@@ -1 @@
---x509certfile=../../client/x509.pem
---x509keyfile=../../client/secret.key
---x509cafile=../../authority/x509.pem
+--x509certfile=client/x509.pem
+--x509keyfile=client/secret.key
+--x509cafile=authority/x509.pem
 --priority=NORMAL

test/tests/16_view-status/apache.conf

@@ -1 @@
-Include ${PWD}/../../base_apache.conf
+Include ${srcdir}/base_apache.conf
 
 LoadModule status_module /usr/lib/apache2/modules/mod_status.so

test/tests/16_view-status/gnutls-cli.args

@@ -1 @@
---x509cafile=../../authority/x509.pem
+--x509cafile=authority/x509.pem
 --priority=NONE:+VERS-TLS1.0:+AES-128-CBC:+SHA1:+RSA:+COMP-NULL

test/tests/17_cgi_vars_large_cert/apache.conf

@@ -1 @@
-Include ${PWD}/../../base_apache.conf
+Include ${srcdir}/base_apache.conf
 
 LoadModule cgi_module /usr/lib/apache2/modules/mod_cgi.so
@@ -7 +7 @@
 GnuTLSCache dbm cache/gnutls_cache
 
-<Directory ${PWD}/../../data>
+<Directory ${srcdir}/data>
  Options +ExecCGI
 </Directory>

test/tests/17_cgi_vars_large_cert/gnutls-cli.args

@@ -1 @@
---x509certfile=../../client/x509.pem
---x509keyfile=../../client/secret.key
---x509cafile=../../authority/x509.pem
+--x509certfile=client/x509.pem
+--x509keyfile=client/secret.key
+--x509cafile=authority/x509.pem
 --priority=NORMAL:-KX-ALL:+DHE-RSA

test/tests/18_client_verification_wrong_cert/apache.conf

@@ -1 @@
-Include ${PWD}/../../base_apache.conf
+Include ${srcdir}/base_apache.conf
 
 GnuTLSCache dbm cache/gnutls_cache

test/tests/18_client_verification_wrong_cert/gnutls-cli.args

@@ -1 @@
---x509certfile=../../rogueca/x509.pem
---x509keyfile=../../rogueca/secret.key
---x509cafile=../../authority/x509.pem
+--x509certfile=rogueca/x509.pem
+--x509keyfile=rogueca/secret.key
+--x509cafile=authority/x509.pem
 --priority=NORMAL

test/tests/19_TLS_reverse_proxy/apache.conf

@@ -1 @@
-Include ${PWD}/../../base_apache.conf
+Include ${srcdir}/base_apache.conf
 
 GnuTLSCache dbm cache/gnutls_cache

test/tests/19_TLS_reverse_proxy/backend.conf

@@ -1 @@
-Include ${PWD}/../../base_apache.conf
+Include ${srcdir}/base_apache.conf
 
 CustomLog logs/${TEST_NAME}.backend.access.log combined

test/tests/19_TLS_reverse_proxy/gnutls-cli.args

@@ -1 @@
---x509cafile=../../authority/x509.pem
+--x509cafile=authority/x509.pem
 --priority=NORMAL

test/tests/20_TLS_reverse_proxy_client_auth/apache.conf

@@ -1 @@
-Include ${PWD}/../../base_apache.conf
+Include ${srcdir}/base_apache.conf
 
 GnuTLSCache dbm cache/gnutls_cache

test/tests/20_TLS_reverse_proxy_client_auth/backend.conf

@@ -1 @@
-Include ${PWD}/../../base_apache.conf
+Include ${srcdir}/base_apache.conf
 
 CustomLog logs/${TEST_NAME}.backend.access.log combined

test/tests/20_TLS_reverse_proxy_client_auth/gnutls-cli.args

@@ -1 @@
---x509cafile=../../authority/x509.pem
+--x509cafile=authority/x509.pem
 --priority=NORMAL

test/tests/21_TLS_reverse_proxy_wrong_cert/apache.conf

@@ -1 @@
-Include ${PWD}/../../base_apache.conf
+Include ${srcdir}/base_apache.conf
 
 GnuTLSCache dbm cache/gnutls_cache

test/tests/21_TLS_reverse_proxy_wrong_cert/backend.conf

@@ -1 @@
-Include ${PWD}/../../base_apache.conf
+Include ${srcdir}/base_apache.conf
 
 CustomLog logs/${TEST_NAME}.backend.access.log combined

test/tests/21_TLS_reverse_proxy_wrong_cert/gnutls-cli.args

@@ -1 @@
---x509cafile=../../authority/x509.pem
+--x509cafile=authority/x509.pem
 --priority=NORMAL

test/tests/22_TLS_reverse_proxy_crl_revoke/apache.conf

@@ -1 @@
-Include ${PWD}/../../base_apache.conf
+Include ${srcdir}/base_apache.conf
 
 GnuTLSCache dbm cache/gnutls_cache
@@ -15 +15 @@
  SSLProxyEngine On
  GnuTLSProxyCAFile      authority/x509.pem
- GnuTLSProxyCRLFile     ${PWD}/crl.pem
+ GnuTLSProxyCRLFile     server/crl.pem
  GnuTLSProxyPriorities  NORMAL
  ProxyPass /proxy/ https://${BACKEND_HOST}:${BACKEND_PORT}/

test/tests/22_TLS_reverse_proxy_crl_revoke/backend.conf

@@ -1 @@
-Include ${PWD}/../../base_apache.conf
+Include ${srcdir}/base_apache.conf
 
 CustomLog logs/${TEST_NAME}.backend.access.log combined

test/tests/22_TLS_reverse_proxy_crl_revoke/gnutls-cli.args

@@ -1 @@
---x509cafile=../../authority/x509.pem
+--x509cafile=authority/x509.pem
 --priority=NORMAL

test/tests/23_TLS_reverse_proxy_mismatched_priorities/apache.conf

@@ -1 @@
-Include ${PWD}/../../base_apache.conf
+Include ${srcdir}/base_apache.conf
 
 GnuTLSCache dbm cache/gnutls_cache

test/tests/23_TLS_reverse_proxy_mismatched_priorities/backend.conf

@@ -1 @@
-Include ${PWD}/../../base_apache.conf
+Include ${srcdir}/base_apache.conf
 
 CustomLog logs/${TEST_NAME}.backend.access.log combined

test/tests/23_TLS_reverse_proxy_mismatched_priorities/gnutls-cli.args

@@ -1 @@
---x509cafile=../../authority/x509.pem
+--x509cafile=authority/x509.pem
 --priority=NORMAL

test/tests/24_pkcs11_cert/apache.conf

@@ -1 @@
-Include ${PWD}/../../base_apache.conf
+Include ${srcdir}/base_apache.conf
 
 GnuTLSCache dbm cache/gnutls_cache

test/tests/24_pkcs11_cert/gnutls-cli.args

@@ -1 @@
---x509cafile=../../authority/x509.pem
+--x509cafile=authority/x509.pem
 --priority=NORMAL

test/tests/24_pkcs11_cert/softhsm.conf.in

@@ -1 @@
-0:__DIR__/../../server/softhsm.db
+0:__DIR__/server/softhsm.db