github-repos/wget
1
0
Fork 0
mirror of https://github.com/mirror/wget.git synced 2024-12-28 22:00:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Let HTTPS tests XFAIL when no TLS support configured

Browse Source 
* 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 <ajuaristi@gmx.es>
This commit is contained in:
Tim Rühsen 2015-07-14 07:54:03 +02:00
parent 25c9b462bf
commit bd0ffcf8bc
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -714,7 +714,7 @@ AS_IF([test "X$enable_pcre" != "Xno"],[
dnl Needed by src/Makefile.am dnl Needed by src/Makefile.am
AM_CONDITIONAL([IRI_IS_ENABLED], [test "X$iri" != "Xno"]) AM_CONDITIONAL([IRI_IS_ENABLED], [test "X$iri" != "Xno"])
AM_CONDITIONAL([WITH_SSL], [test "X$with_ssl" != "Xno"])
dnl dnl
dnl Create output dnl Create output

14
testenv/Makefile.am
View File

@ -29,6 +29,8 @@
AUTOMAKE_OPTIONS = parallel-tests AUTOMAKE_OPTIONS = parallel-tests
AM_TESTS_ENVIRONMENT = export WGETRC=/dev/null; MAKE_CHECK=True; export MAKE_CHECK;\ AM_TESTS_ENVIRONMENT = export WGETRC=/dev/null; MAKE_CHECK=True; export MAKE_CHECK;\
export PYTHONPATH=$$PYTHONPATH:$(srcdir); export VALGRIND_TESTS="@VALGRIND_TESTS@"; export PYTHONPATH=$$PYTHONPATH:$(srcdir); export VALGRIND_TESTS="@VALGRIND_TESTS@";
SSL_TESTS = Test--https.py Test--https-crl.py
if HAVE_PYTHON3 if HAVE_PYTHON3
TESTS = Test-auth-basic-fail.py \ TESTS = Test-auth-basic-fail.py \
Test-auth-basic.py \ Test-auth-basic.py \
@ -47,21 +49,23 @@ if HAVE_PYTHON3
Test-cookie-expires.py \ Test-cookie-expires.py \
Test-cookie.py \ Test-cookie.py \
Test-Head.py \ Test-Head.py \
Test--https.py \
Test--https-crl.py \
Test-O.py \ Test-O.py \
Test-Post.py \ Test-Post.py \
Test-504.py \ Test-504.py \
Test--spider-r.py \ Test--spider-r.py \
Test-redirect-crash.py \ Test-redirect-crash.py \
Test-reserved-chars.py \ Test-reserved-chars.py \
Test-condget.py Test-condget.py \
$(SSL_TESTS)
# added test cases expected to fail here and under TESTS # added test cases expected to fail here and under TESTS
XFAIL_TESTS = if !WITH_SSL
XFAIL_TESTS = $(SSL_TESTS)
endif 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 TEST_EXTENSIONS = .py
PY_LOG_COMPILER = python3 PY_LOG_COMPILER = python3