From bd0ffcf8bc51174904f3f5a4716b2e2b2e768aa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20R=C3=BChsen?= Date: Tue, 14 Jul 2015 07:54:03 +0200 Subject: [PATCH] Let HTTPS tests XFAIL when no TLS support configured * configure.ac: Export WITH_SSL for use in Makefile.am * testenv/Makefile.am: Add HTTPS tests to XFAIL_TESTS when !WITH_SSL Reported-by: Ander Juaristi --- configure.ac | 2 +- testenv/Makefile.am | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac index 01ea2371..54504556 100644 --- a/configure.ac +++ b/configure.ac @@ -714,7 +714,7 @@ AS_IF([test "X$enable_pcre" != "Xno"],[ dnl Needed by src/Makefile.am AM_CONDITIONAL([IRI_IS_ENABLED], [test "X$iri" != "Xno"]) - +AM_CONDITIONAL([WITH_SSL], [test "X$with_ssl" != "Xno"]) dnl dnl Create output diff --git a/testenv/Makefile.am b/testenv/Makefile.am index 10584219..6cd84c8f 100644 --- a/testenv/Makefile.am +++ b/testenv/Makefile.am @@ -29,6 +29,8 @@ AUTOMAKE_OPTIONS = parallel-tests AM_TESTS_ENVIRONMENT = export WGETRC=/dev/null; MAKE_CHECK=True; export MAKE_CHECK;\ export PYTHONPATH=$$PYTHONPATH:$(srcdir); export VALGRIND_TESTS="@VALGRIND_TESTS@"; + +SSL_TESTS = Test--https.py Test--https-crl.py if HAVE_PYTHON3 TESTS = Test-auth-basic-fail.py \ Test-auth-basic.py \ @@ -47,21 +49,23 @@ if HAVE_PYTHON3 Test-cookie-expires.py \ Test-cookie.py \ Test-Head.py \ - Test--https.py \ - Test--https-crl.py \ Test-O.py \ Test-Post.py \ Test-504.py \ Test--spider-r.py \ Test-redirect-crash.py \ Test-reserved-chars.py \ - Test-condget.py + Test-condget.py \ + $(SSL_TESTS) # added test cases expected to fail here and under TESTS - XFAIL_TESTS = +if !WITH_SSL + XFAIL_TESTS = $(SSL_TESTS) endif -EXTRA_DIST = certs conf exc misc server test README $(TESTS) $(XFAIL_TESTS) +endif + +EXTRA_DIST = certs conf exc misc server test README $(TESTS) TEST_EXTENSIONS = .py PY_LOG_COMPILER = python3