Changeset 478767a in mod_gnutls

Timestamp:

Jan 9, 2020, 3:26:32 PM (3 years ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

asyncio, main, master, proxy-ticket

Children:

0da2c5d

Parents:

ff039b1

Message:

Generate test scripts instead of carrying static files

Location:

test

Files:

• .gitignore (modified) (1 diff)
• Makefile.am (modified) (4 diffs)
• test-00_basic.bash (deleted)
• test-01_serverwide_priorities.bash (deleted)
• test-02_cache_in_vhost.bash (deleted)
• test-03_cachetimeout_in_vhost.bash (deleted)
• test-04_basic_nosni.bash (deleted)
• test-05_mismatched-priorities.bash (deleted)
• test-06_verify_sni_a.bash (deleted)
• test-07_verify_sni_b.bash (deleted)
• test-08_verify_no_sni_fallback_to_first_vhost.bash (deleted)
• test-09_verify_no_sni_fails_with_wrong_order.bash (deleted)
• test-10_basic_client_verification.bash (deleted)
• test-11_basic_client_verification_fail.bash (deleted)
• test-12_cgi_variables.bash (deleted)
• test-13_cgi_variables_no_client_cert.bash (deleted)
• test-14_resume_session.bash (deleted)
• test-15_basic_msva.bash (deleted)
• test-16_view-status.bash (deleted)
• test-17_cgi_vars_large_cert.bash (deleted)
• test-18_client_verification_wrong_cert.bash (deleted)
• test-19_TLS_reverse_proxy.bash (deleted)
• test-20_TLS_reverse_proxy_client_auth.bash (deleted)
• test-21_TLS_reverse_proxy_wrong_cert.bash (deleted)
• test-22_TLS_reverse_proxy_crl_revoke.bash (deleted)
• test-23_TLS_reverse_proxy_mismatched_priorities.bash (deleted)
• test-24_pkcs11_cert.bash (deleted)
• test-25_Disable_TLS_1.0.bash (deleted)
• test-26_redirect_HTTP_to_HTTPS.bash (deleted)
• test-27_OCSP_server.bash (deleted)
• test-28_HTTP2_support.bash (deleted)
• test-29_force_handshake_vhost.bash (deleted)
• test-30_ip_based_vhosts.bash (deleted)
• test-31_vhost_SNI_serveralias_match.bash (deleted)
• test-32_vhost_SNI_serveralias_mismatch.bash (deleted)
• test-33_vhost_SNI_serveralias_missinghost.bash (deleted)
• test-34_TLS_reverse_proxy_h2.bash (deleted)
• test-template.bash.in (added)

test/.gitignore

@@ -36 +36 @@
 
 # test programs
+test-*.bash
 gen_ocsp_index
 pgpcrc

test/Makefile.am

@@ -1 +1 @@
 SUBDIRS = tests
 
-test_scripts = doctest-mgstest.py \
-        test-00_basic.bash \
+# Generate the test scripts
+test-%.bash: test-template.bash.in | tests/%/
+        testname="$(*)"; sed s/@NUMBER@/$${testname%%_*}/ < $< > $@
+        chmod a+x $@
+
+check_SCRIPTS = test-00_basic.bash \
         test-01_serverwide_priorities.bash \
         test-02_cache_in_vhost.bash \
@@ -18 +22 @@
         test-14_resume_session.bash
 if USE_MSVA
-test_scripts += test-15_basic_msva.bash
-endif
-test_scripts += test-16_view-status.bash \
+check_SCRIPTS += test-15_basic_msva.bash
+endif
+check_SCRIPTS += test-16_view-status.bash \
         test-17_cgi_vars_large_cert.bash \
         test-18_client_verification_wrong_cert.bash \
@@ -40 +44 @@
         test-34_TLS_reverse_proxy_h2.bash
 
+MOSTLYCLEANFILES = $(check_SCRIPTS)
+dist_check_SCRIPTS = netns_py.bash test-template.bash.in
+
 TEST_EXTENSIONS = .bash .py
 PY_LOG_COMPILER = $(PYTHON)
-TESTS = $(test_scripts)
-
-dist_check_SCRIPTS = netns_py.bash $(test_scripts)
+TESTS = doctest-mgstest.py $(check_SCRIPTS)
 
 check_PROGRAMS = pgpcrc
@@ -106 +111 @@
 check_DATA = $(tokens) authority/server/crl.pem
 
-MOSTLYCLEANFILES = cache/* logs/* outputs/* authority/server/crl.pem
+MOSTLYCLEANFILES += cache/* logs/* outputs/* authority/server/crl.pem
 
 cert_templates = authority/template.in authority/client/template.in \