moparisthebest/wget
1
0
Fork 0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00
Code Issues Releases Wiki Activity

Skip python tests if python3 is not available

Browse Source 
Reported-by: kdevel@vogtner.de
This commit is contained in:
Tim Ruehsen 2014-11-05 21:35:13 +01:00 committed by Tim Rühsen
parent 7259c30929
commit 831b9d1880
3 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2014-11-05 Tim Ruehsen <tim.ruehsen@gmx.de>
* configure.ac: check for python3
* Makefile.am: only use python test suite if python3 found
2014-11-05 Giuseppe Scrivano <gscrivan@redhat.com> 2014-11-05 Giuseppe Scrivano <gscrivan@redhat.com>
* contrib/tsocked-wget (TSOCKS_CONF_FILE): Remove empty new-line. * contrib/tsocked-wget (TSOCKS_CONF_FILE): Remove empty new-line.

6
configure.ac
View File

@ -135,6 +135,12 @@ AC_AIX
gl_EARLY gl_EARLY
dnl
dnl Find python3
dnl
AM_PATH_PYTHON([3.0],,[:])
AM_CONDITIONAL([HAVE_PYTHON3], [test "$PYTHON" != :])
dnl dnl
dnl Gettext dnl Gettext
dnl dnl

2
testenv/Makefile.am
View File

@ -29,6 +29,7 @@
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@";
if HAVE_PYTHON3
TESTS = Test-auth-basic-fail.py \ TESTS = Test-auth-basic-fail.py \
Test-auth-basic.py \ Test-auth-basic.py \
Test-auth-both.py \ Test-auth-both.py \
@ -51,6 +52,7 @@ TESTS = Test-auth-basic-fail.py \
Test--spider-r.py Test--spider-r.py
XFAIL_TESTS = Test-auth-both.py XFAIL_TESTS = Test-auth-both.py
endif
EXTRA_DIST = certs conf exc misc server test README $(TESTS) $(XFAIL_TESTS) EXTRA_DIST = certs conf exc misc server test README $(TESTS) $(XFAIL_TESTS)