Changeset 02c8e54 in mod_gnutls for test


Ignore:
Timestamp:
Nov 22, 2015, 1:43:48 PM (5 years ago)
Author:
Daniel Kahn Gillmor <dkg@…>
Branches:
debian/master, debian/stretch-backports, jessie-backports, upstream
Children:
63468af, 8a264b0, bcbcf5d
Parents:
89f863f (diff), 07cc51f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Imported Upstream version 0.7.2

Location:
test
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • test/Makefile.am

    r89f863f r02c8e54  
    134134# port for MSVA in test cases that use it
    135135MSVA_PORT ?= 9933
    136 # maximum time to wait for MSVA startup
    137 TEST_MSVA_MAX_WAIT ?= 10
    138 # wait loop time for MSVA startup
    139 TEST_MSVA_WAIT ?= 0.4
     136# maximum time to wait for MSVA startup (milliseconds)
     137TEST_MSVA_MAX_WAIT ?= 10000
     138# wait loop time for MSVA startup (milliseconds)
     139TEST_MSVA_WAIT ?= 400
    140140# seconds for the HTTP request to be sent and responded to
    141141TEST_QUERY_DELAY ?= 30
  • test/Makefile.in

    r89f863f r02c8e54  
    1 # Makefile.in generated by automake 1.14.1 from Makefile.am.
     1# Makefile.in generated by automake 1.15 from Makefile.am.
    22# @configure_input@
    33
    4 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
     4# Copyright (C) 1994-2014 Free Software Foundation, Inc.
    55
    66# This Makefile.in is free software; the Free Software Foundation
     
    2323# for the test suite
    2424VPATH = @srcdir@
    25 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
     25am__is_gnu_make = { \
     26  if test -z '$(MAKELEVEL)'; then \
     27    false; \
     28  elif test -n '$(MAKE_HOST)'; then \
     29    true; \
     30  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
     31    true; \
     32  else \
     33    false; \
     34  fi; \
     35}
    2636am__make_running_with_option = \
    2737  case $${target_option-} in \
     
    8898target_triplet = @target@
    8999@USE_MSVA_TRUE@am__append_1 = test-15_basic_msva.bash
    90 DIST_COMMON = $(srcdir)/test_ca.mk $(srcdir)/Makefile.in \
    91         $(srcdir)/Makefile.am $(am__dist_check_SCRIPTS_DIST) \
    92         $(top_srcdir)/config/test-driver README
    93100@USE_MSVA_TRUE@am__append_2 = $(msva_home)/trustdb.gpg client.uid
    94101@USE_MSVA_TRUE@am__append_3 = $(msva_home)/trustdb.gpg
     
    103110am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    104111        $(ACLOCAL_M4)
     112DIST_COMMON = $(srcdir)/Makefile.am $(am__dist_check_SCRIPTS_DIST) \
     113        $(am__DIST_COMMON)
    105114mkinstalldirs = $(install_sh) -d
    106115CONFIG_HEADER = $(top_builddir)/include/mod_gnutls_config.h
     
    385394        $(TEST_LOG_FLAGS)
    386395DIST_SUBDIRS = $(SUBDIRS)
     396am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/test_ca.mk \
     397        $(top_srcdir)/config/test-driver README
    387398DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    388399am__relativize = \
     
    423434APR_MEMCACHE_CFLAGS = @APR_MEMCACHE_CFLAGS@
    424435APR_MEMCACHE_LIBS = @APR_MEMCACHE_LIBS@
     436APR_UTIL_CONF = @APR_UTIL_CONF@
    425437APU_INCLUDES = @APU_INCLUDES@
    426438APU_LDFLAGS = @APU_LDFLAGS@
     
    695707        $(am__cd) $(top_srcdir) && \
    696708          $(AUTOMAKE) --gnu test/Makefile
    697 .PRECIOUS: Makefile
    698709Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    699710        @case '$?' in \
     
    704715            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
    705716        esac;
    706 $(srcdir)/test_ca.mk:
     717$(srcdir)/test_ca.mk $(am__empty):
    707718
    708719$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
     
    850861          echo "fatal: making $(TEST_SUITE_LOG): possible infinite" \
    851862               "recursion detected" >&2; \
    852         else \
     863        elif test -n "$$redo_logs"; then \
    853864          am__remaking_logs=yes $(MAKE) $(AM_MAKEFLAGS) $$redo_logs; \
    854865        fi; \
     
    13301341        recheck tags tags-am uninstall uninstall-am
    13311342
     1343.PRECIOUS: Makefile
     1344
    13321345
    13331346%.template: $(srcdir)/%.template.in
     
    13691382        certtool --generate-self-signed --load-privkey rogueca/secret.key --template $(srcdir)/rogueca.template > $@
    13701383
    1371 %/cert-request: %.template %/secret.key 
     1384%/cert-request: %.template %/secret.key
    13721385        certtool --generate-request --load-privkey $(dir $@)secret.key --template $< > $@
    13731386
    1374 %/x509.pem: %.template %/cert-request authority/secret.key authority/x509.pem 
     1387%/x509.pem: %.template %/cert-request authority/secret.key authority/x509.pem
    13751388        certtool --generate-certificate --load-ca-certificate authority/x509.pem --load-ca-privkey authority/secret.key --load-request $(dir $@)cert-request --template $< > $@
    13761389
     
    14081421# port for MSVA in test cases that use it
    14091422MSVA_PORT ?= 9933
    1410 # maximum time to wait for MSVA startup
    1411 TEST_MSVA_MAX_WAIT ?= 10
    1412 # wait loop time for MSVA startup
    1413 TEST_MSVA_WAIT ?= 0.4
     1423# maximum time to wait for MSVA startup (milliseconds)
     1424TEST_MSVA_MAX_WAIT ?= 10000
     1425# wait loop time for MSVA startup (milliseconds)
     1426TEST_MSVA_WAIT ?= 400
    14141427# seconds for the HTTP request to be sent and responded to
    14151428TEST_QUERY_DELAY ?= 30
  • test/runtests

    r89f863f r02c8e54  
    124124    ret=1
    125125    export MONKEYSPHERE_VALIDATION_AGENT_SOCKET="http://127.0.0.1:$MSVA_PORT"
    126     # wait at most TEST_MSVA_MAX_WAIT seconds for MSVA to get ready
    127     waited=0.0
     126
     127    # convert TEST_MSVA_WAIT to seconds because that's what "sleep" expects
     128    TEST_MSVA_SLEEP="$((${TEST_MSVA_WAIT} / 1000)).$((${TEST_MSVA_WAIT} % 1000))"
     129    # wait at most TEST_MSVA_MAX_WAIT milliseconds for MSVA to get ready
     130    waited=0
    128131    until [ ${ret} -eq 0 ] \
    129               || [ $(echo "${waited} > ${TEST_MSVA_MAX_WAIT}" | bc) -eq 1 ]; do
     132              || [ ${waited} -ge ${TEST_MSVA_MAX_WAIT} ]; do
    130133        if msva-query-agent https "$(cat client.uid)" x509pem client < client/x509.pem
    131134        then
     
    134137            echo "MSVA not ready yet"
    135138        fi
    136         sleep "${TEST_MSVA_WAIT}"
    137         waited=$(echo "${waited} + ${TEST_MSVA_WAIT}" | bc)
     139        sleep "${TEST_MSVA_SLEEP}"
     140        waited=$((${waited} + ${TEST_MSVA_WAIT}))
    138141    done
    139142
  • test/test_ca.mk

    r89f863f r02c8e54  
    4545        certtool --generate-self-signed --load-privkey rogueca/secret.key --template $(srcdir)/rogueca.template > $@
    4646
    47 %/cert-request: %.template %/secret.key 
     47%/cert-request: %.template %/secret.key
    4848        certtool --generate-request --load-privkey $(dir $@)secret.key --template $< > $@
    4949
    50 %/x509.pem: %.template %/cert-request authority/secret.key authority/x509.pem 
     50%/x509.pem: %.template %/cert-request authority/secret.key authority/x509.pem
    5151        certtool --generate-certificate --load-ca-certificate authority/x509.pem --load-ca-privkey authority/secret.key --load-request $(dir $@)cert-request --template $< > $@
    5252
  • test/tests/Makefile.in

    r89f863f r02c8e54  
    1 # Makefile.in generated by automake 1.14.1 from Makefile.am.
     1# Makefile.in generated by automake 1.15 from Makefile.am.
    22# @configure_input@
    33
    4 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
     4# Copyright (C) 1994-2014 Free Software Foundation, Inc.
    55
    66# This Makefile.in is free software; the Free Software Foundation
     
    1515@SET_MAKE@
    1616VPATH = @srcdir@
    17 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
     17am__is_gnu_make = { \
     18  if test -z '$(MAKELEVEL)'; then \
     19    false; \
     20  elif test -n '$(MAKE_HOST)'; then \
     21    true; \
     22  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
     23    true; \
     24  else \
     25    false; \
     26  fi; \
     27}
    1828am__make_running_with_option = \
    1929  case $${target_option-} in \
     
    8090target_triplet = @target@
    8191subdir = test/tests
    82 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am
    8392ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
    8493am__aclocal_m4_deps = $(top_srcdir)/m4/apache.m4 \
     
    9099am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
    91100        $(ACLOCAL_M4)
     101DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
    92102mkinstalldirs = $(install_sh) -d
    93103CONFIG_HEADER = $(top_builddir)/include/mod_gnutls_config.h
     
    114124  esac
    115125am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
     126am__DIST_COMMON = $(srcdir)/Makefile.in
    116127DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
    117128ACLOCAL = @ACLOCAL@
     
    127138APR_MEMCACHE_CFLAGS = @APR_MEMCACHE_CFLAGS@
    128139APR_MEMCACHE_LIBS = @APR_MEMCACHE_LIBS@
     140APR_UTIL_CONF = @APR_UTIL_CONF@
    129141APU_INCLUDES = @APU_INCLUDES@
    130142APU_LDFLAGS = @APU_LDFLAGS@
     
    317329        $(am__cd) $(top_srcdir) && \
    318330          $(AUTOMAKE) --gnu test/tests/Makefile
    319 .PRECIOUS: Makefile
    320331Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
    321332        @case '$?' in \
     
    492503        tags-am uninstall uninstall-am
    493504
     505.PRECIOUS: Makefile
     506
    494507
    495508# Tell versions [3.59,3.63) of GNU make to not export all variables.
Note: See TracChangeset for help on using the changeset viewer.