Changeset b47dc70 in mod_gnutls

Timestamp:

Oct 31, 2018, 4:46:15 PM (10 months ago)

Author:

Fiona Klute <fiona.klute@…>

Branches:

debian/master, master

Children:

af9e3a5

Parents:

3aff94d

Message:

Test suite: Simplify certificate template creation

Location:

test

Files:

• Makefile.am (modified) (1 diff)
• server.template.in (modified) (1 diff)
• test_ca.mk (modified) (1 diff)

test/Makefile.am

@@ -245 +245 @@
 if ENABLE_OCSP_TEST
 OCSP_PORT ?= 9936
+OCSP_URI_TEMPLATE = ocsp_uri = http://$(TEST_HOST):$(OCSP_PORT)/ocsp/
 endif
 # maximum time to wait for MSVA startup (milliseconds)

test/server.template.in

@@ -5 +5 @@
 encryption_key
 dns_name="__HOSTNAME__"
-### ocsp_uri=http://__HOSTNAME__:__OCSP_PORT__/ocsp/
+__OCSP_URI__
 __IP_ADDRESSES__

test/test_ca.mk

@@ -9 +9 @@
 %.template: $(srcdir)/%.template.in
         sed s/__HOSTNAME__/$(TEST_HOST)/ < $< > $@
-        if test -n "$(OCSP_PORT)"; then \
-                sed -i -e 's/^### ocsp/ocsp/' \
-                        -e s/__OCSP_PORT__/$(OCSP_PORT)/ $@; \
-        fi
-        for i in $$(echo $(TEST_IP)); do \
-                i="$${i%\]}"; \
-                IP_ADDRS="$${IP_ADDRS}\nip_address = $${i#\[}"; \
+        sed -i -e "s,__OCSP_URI__,$(OCSP_URI_TEMPLATE)," $@
+        for i in $(patsubst [%],%,$(TEST_IP)); do \
+                IP_ADDRS="$${IP_ADDRS}\nip_address = $${i}"; \
         done; \
-        sed -i -e "s,__IP_ADDRESSES__,$${IP_ADDRS}," $@
+        sed -i -e "s,__IP_ADDRESSES__,$${IP_ADDRS#\\n}," $@
 
 %.uid: $(srcdir)/%.uid.in