Changeset 34e5dc7 in mod_gnutls

Timestamp:

Sep 19, 2015, 5:29:36 PM (4 years ago)

Author:

Thomas Klute <thomas2.klute@…>

Branches:

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

Children:

f9f184f

Parents:

dff03fa

Message:

Test suite: Call "runtests" directly from test scripts

The test scripts used to call runtests through TestMakefile?, which set
up the environment. Moving the environment configuration to
AM_TESTS_ENVIRONMENT in Makefile.am avoids this additional call to
make.

TEST_GAP has been renamed to TEST_MSVA_WAIT because the sleep time in
the MSVA startup loop is its only remaining use.

Location:

test

Files:

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

test/Makefile.am

@@ -85 +85 @@
         TestMakefile
 
+# Lockfile for the main Apache process
+test_lockfile = ./test.lock
 # Maximum wait time in seconds for flock to aquire instance lock files
 lock_wait = 30
 
+# port for the main Apache server
+TEST_PORT ?= 9932
+# port for MSVA in test cases that use it
+MSVA_PORT ?= 9933
+# maximum time to wait for MSVA startup
+TEST_MSVA_MAX_WAIT ?= 10
+# wait loop time for MSVA startup
+TEST_MSVA_WAIT ?= 0.4
+# seconds for the HTTP request to be sent and responded to
+TEST_QUERY_DELAY ?= 30
+
 AM_TESTS_ENVIRONMENT = export APACHE2=$(APACHE2); \
         export AP_LIBEXECDIR=$(AP_LIBEXECDIR); \
-        export TEST_LOCK_WAIT=$(lock_wait); \
+        export TEST_LOCK="$(test_lockfile)"; \
+        export TEST_LOCK_WAIT="$(lock_wait)"; \
         export TEST_HOST="$(TEST_HOST)"; \
         export TEST_IP="$(TEST_IP)"; \
+        export TEST_PORT="$(TEST_PORT)"; \
+        export MSVA_PORT="$(MSVA_PORT)"; \
+        export TEST_MSVA_MAX_WAIT="$(TEST_MSVA_MAX_WAIT)"; \
+        export TEST_MSVA_WAIT="$(TEST_MSVA_WAIT)"; \
+        export TEST_QUERY_DELAY="$(TEST_QUERY_DELAY)"; \
         export BACKEND_HOST="$(TEST_HOST)"; \
         export BACKEND_IP="$(TEST_IP)";

test/README

@@ -97 +97 @@
    possible that these tests will fail for timing
    reasons. [TEST_QUERY_DELAY (seconds for the http request to be sent
-   and responded to)] and [TEST_GAP (seconds to wait between tests)]
+   and responded to)]

test/TestMakefile

@@ -12 +12 @@
 
 export TEST_HOST ?= localhost
-export TEST_IP ?= ::1
-# chosen at random:
-export TEST_PORT ?= 9932
-export MSVA_PORT ?= 9933
-
-export TEST_GAP ?= 0.4
-export TEST_MSVA_MAX_WAIT ?= 10
-export TEST_QUERY_DELAY ?= 30
-export TEST_LOCK_WAIT ?= 30
-
-TEST_LOCK := ./test.lock
-
-all: setup.done
-        TEST_LOCK=$(TEST_LOCK) $(srcdir)/runtests
-
-t-%: setup.done
-        TEST_LOCK=$(TEST_LOCK) $(srcdir)/runtests $@
 
 

test/runtests

@@ -17 +17 @@
 
 BADVARS=0
-for v in APACHE2 TEST_HOST TEST_IP TEST_PORT TEST_QUERY_DELAY TEST_GAP \
+for v in APACHE2 TEST_HOST TEST_IP TEST_PORT TEST_QUERY_DELAY TEST_MSVA_WAIT \
                  MSVA_PORT TEST_LOCK; do
     if [ ! -v "$v" ]; then
@@ -134 +134 @@
             echo "MSVA not ready yet"
         fi
-        sleep "${TEST_GAP}"
-        waited=$(echo "${waited} + ${TEST_GAP}" | bc)
+        sleep "${TEST_MSVA_WAIT}"
+        waited=$(echo "${waited} + ${TEST_MSVA_WAIT}" | bc)
     done
 

test/test-00_basic.bash

@@ -1 +1 @@
 #!/bin/bash
-make -f $(dirname ${0})/TestMakefile t-0
+${srcdir}/runtests t-0

test/test-01_serverwide_priorities.bash

@@ -1 +1 @@
 #!/bin/bash
-make -f $(dirname ${0})/TestMakefile t-1
+${srcdir}/runtests t-1

test/test-02_cache_in_vhost.bash

@@ -1 +1 @@
 #!/bin/bash
-make -f $(dirname ${0})/TestMakefile t-2
+${srcdir}/runtests t-2

test/test-03_cachetimeout_in_vhost.bash

@@ -1 +1 @@
 #!/bin/bash
-make -f $(dirname ${0})/TestMakefile t-3
+${srcdir}/runtests t-3

test/test-04_basic_nosni.bash

@@ -1 +1 @@
 #!/bin/bash
-make -f $(dirname ${0})/TestMakefile t-4
+${srcdir}/runtests t-4

test/test-05_mismatched-priorities.bash

@@ -1 +1 @@
 #!/bin/bash
-make -f $(dirname ${0})/TestMakefile t-5
+${srcdir}/runtests t-5

test/test-06_verify_sni_a.bash

@@ -1 +1 @@
 #!/bin/bash
-make -f $(dirname ${0})/TestMakefile t-6
+${srcdir}/runtests t-6

test/test-07_verify_sni_b.bash

@@ -1 +1 @@
 #!/bin/bash
-make -f $(dirname ${0})/TestMakefile t-7
+${srcdir}/runtests t-7

test/test-08_verify_no_sni_fallback_to_first_vhost.bash

@@ -1 +1 @@
 #!/bin/bash
-make -f $(dirname ${0})/TestMakefile t-8
+${srcdir}/runtests t-8

test/test-09_verify_no_sni_fails_with_wrong_order.bash

@@ -1 +1 @@
 #!/bin/bash
-make -f $(dirname ${0})/TestMakefile t-9
+${srcdir}/runtests t-9

test/test-10_basic_client_verification.bash

@@ -1 +1 @@
 #!/bin/bash
-make -f $(dirname ${0})/TestMakefile t-10
+${srcdir}/runtests t-10

test/test-11_basic_client_verification_fail.bash

@@ -1 +1 @@
 #!/bin/bash
-make -f $(dirname ${0})/TestMakefile t-11
+${srcdir}/runtests t-11

test/test-12_cgi_variables.bash

@@ -1 +1 @@
 #!/bin/bash
-make -f $(dirname ${0})/TestMakefile t-12
+${srcdir}/runtests t-12

test/test-13_cgi_variables_no_client_cert.bash

@@ -1 +1 @@
 #!/bin/bash
-make -f $(dirname ${0})/TestMakefile t-13
+${srcdir}/runtests t-13

test/test-14_basic_openpgp.bash

@@ -1 +1 @@
 #!/bin/bash
-make -f $(dirname ${0})/TestMakefile t-14
+${srcdir}/runtests t-14

test/test-15_basic_msva.bash

@@ -1 +1 @@
 #!/bin/bash
-USE_MSVA="yes" make -f $(dirname ${0})/TestMakefile t-15
+USE_MSVA="yes" ${srcdir}/runtests t-15

test/test-16_view-status.bash

@@ -1 +1 @@
 #!/bin/bash
-make -f $(dirname ${0})/TestMakefile t-16
+${srcdir}/runtests t-16

test/test-17_cgi_vars_large_cert.bash

@@ -1 +1 @@
 #!/bin/bash
-make -f $(dirname ${0})/TestMakefile t-17
+${srcdir}/runtests t-17

test/test-18_client_verification_wrong_cert.bash

@@ -1 +1 @@
 #!/bin/bash
-make -f $(dirname ${0})/TestMakefile t-18
+${srcdir}/runtests t-18

test/test-19_TLS_reverse_proxy.bash

@@ -14 +14 @@
 trap stop_backend EXIT
 
-make -f $(dirname ${0})/TestMakefile t-19
+${srcdir}/runtests t-19
 
 backend_apache "${testdir}" "backend.conf" stop

test/test-20_TLS_reverse_proxy_client_auth.bash

@@ -14 +14 @@
 trap stop_backend EXIT
 
-make -f $(dirname ${0})/TestMakefile t-20
+${srcdir}/runtests t-20
 
 backend_apache "${testdir}" "backend.conf" stop

test/test-21_TLS_reverse_proxy_wrong_cert.bash

@@ -14 +14 @@
 trap stop_backend EXIT
 
-make -f $(dirname ${0})/TestMakefile t-21
+${srcdir}/runtests t-21
 
 backend_apache "${testdir}" "backend.conf" stop

test/test-22_TLS_reverse_proxy_crl_revoke.bash

@@ -14 +14 @@
 trap stop_backend EXIT
 
-make -f $(dirname ${0})/TestMakefile t-22
+${srcdir}/runtests t-22
 
 backend_apache "${testdir}" "backend.conf" stop

test/test-23_TLS_reverse_proxy_mismatched_priorities.bash

@@ -19 +19 @@
 trap stop_backend EXIT
 
-make -f $(dirname ${0})/TestMakefile t-23
+${srcdir}/runtests t-23
 
 backend_apache "${testdir}" "backend.conf" stop

test/test-24_pkcs11_cert.bash

@@ -25 +25 @@
 set -e
 
-make -f $(dirname ${0})/TestMakefile t-24
+${srcdir}/runtests t-24
 
 cleanup_tmpconf