From 826f2c3689d5a898d7f111da718f466719784f32 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Tue, 27 Mar 2018 18:39:23 +0100 Subject: [PATCH] For Subversion 1.9, only run test suite with Py2 (Py3 supported with 1.10). --- subversion.spec | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/subversion.spec b/subversion.spec index c952e41..209d3d3 100644 --- a/subversion.spec +++ b/subversion.spec @@ -1,17 +1,17 @@ # set to zero to avoid running test suite +%bcond_without kwallet +%bcond_without python2 +%bcond_with python3 + %ifarch %{power64} s390x %global with_java 0 %global make_check 0 %else %global with_java 1 -%global make_check 1 +%global make_check %{with python2} %endif -%bcond_without kwallet -%bcond_without python2 -%bcond_with python3 - %if %{with python2} == %{with python3} %error Pick exactly one Python version %endif @@ -386,6 +386,11 @@ export LANG=C LC_ALL=C export LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} export MALLOC_PERTURB_=171 MALLOC_CHECK_=3 export LIBC_FATAL_STDERR_=1 +%if %{with python2} +export PYTHON=/usr/bin/python2 +%else +export PYTHON=/usr/bin/python3 +%endif if ! make check check-swig-pl check-swig-py check-swig-rb CLEANUP=yes; then : Test suite failure. cat fails.log