Changeset b47dc70 in mod_gnutls


Ignore:
Timestamp:
Oct 31, 2018, 4:46:15 PM (5 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:
3 edited

Legend:

Unmodified
Added
Removed
  • test/Makefile.am

    r3aff94d rb47dc70  
    245245if ENABLE_OCSP_TEST
    246246OCSP_PORT ?= 9936
     247OCSP_URI_TEMPLATE = ocsp_uri = http://$(TEST_HOST):$(OCSP_PORT)/ocsp/
    247248endif
    248249# maximum time to wait for MSVA startup (milliseconds)
  • test/server.template.in

    r3aff94d rb47dc70  
    55encryption_key
    66dns_name="__HOSTNAME__"
    7 ### ocsp_uri=http://__HOSTNAME__:__OCSP_PORT__/ocsp/
     7__OCSP_URI__
    88__IP_ADDRESSES__
  • test/test_ca.mk

    r3aff94d rb47dc70  
    99%.template: $(srcdir)/%.template.in
    1010        sed s/__HOSTNAME__/$(TEST_HOST)/ < $< > $@
    11         if test -n "$(OCSP_PORT)"; then \
    12                 sed -i -e 's/^### ocsp/ocsp/' \
    13                         -e s/__OCSP_PORT__/$(OCSP_PORT)/ $@; \
    14         fi
    15         for i in $$(echo $(TEST_IP)); do \
    16                 i="$${i%\]}"; \
    17                 IP_ADDRS="$${IP_ADDRS}\nip_address = $${i#\[}"; \
     11        sed -i -e "s,__OCSP_URI__,$(OCSP_URI_TEMPLATE)," $@
     12        for i in $(patsubst [%],%,$(TEST_IP)); do \
     13                IP_ADDRS="$${IP_ADDRS}\nip_address = $${i}"; \
    1814        done; \
    19         sed -i -e "s,__IP_ADDRESSES__,$${IP_ADDRS}," $@
     15        sed -i -e "s,__IP_ADDRESSES__,$${IP_ADDRS#\\n}," $@
    2016
    2117%.uid: $(srcdir)/%.uid.in
Note: See TracChangeset for help on using the changeset viewer.