From ebad26bb2647ecabe7b160492f1d53d69196986e Mon Sep 17 00:00:00 2001
From: Darshit Shah <address@hidden>
Date: Thu, 3 Dec 2015 16:51:32 +0100
Subject: [PATCH] Do not run unsupported tests

---
 testenv/Makefile.am | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/testenv/Makefile.am b/testenv/Makefile.am
index 7fe24bd..9fa73d3 100644
--- a/testenv/Makefile.am
+++ b/testenv/Makefile.am
@@ -37,7 +37,12 @@ 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 Test-hsts.py
+if WITH_SSL
+  SSL_TESTS = Test--https.py Test--https-crl.py Test-hsts.py
+else
+  SSL_TESTS =
+endif
+
 if HAVE_PYTHON3
   TESTS = Test-auth-basic-fail.py                   \
     Test-auth-basic.py                              \
@@ -66,14 +71,9 @@ if HAVE_PYTHON3
     Test-redirect-crash.py                          \
     Test-reserved-chars.py                          \
     Test-condget.py                                 \
-    $(SSL_TESTS)				    \
+    $(SSL_TESTS)                                    \
     $(METALINK_TESTS)
 
-  # added test cases expected to fail here and under TESTS
-if !WITH_SSL
-  XFAIL_TESTS = $(SSL_TESTS)
-endif
-
 endif
 
 EXTRA_DIST = certs conf exc misc server test README $(TESTS)
-- 
2.6.3