- Sort out the bcond_with/without for the multibuild to work

properly

OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/scons?expand=0&rev=79

scons.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Mar 26 11:24:14 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
+
+- Sort out the bcond_with/without for the multibuild to work
+  properly
+
 -------------------------------------------------------------------
 Mon Mar 25 09:32:57 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
 

scons.spec

@@ -18,16 +18,13 @@
 
 %define modname scons
 %global flavor @BUILD_FLAVOR@%{nil}
-# Tests on non-Intel archs have too many failing tests
-# https://pairlist4.pair.net/pipermail/scons-users/2018-October/007311.html
-%ifnarch aarch64 armv7l ppc64 ppc64le s390x
 %if "%{flavor}" == "test"
 %define psuffix -test
 %bcond_without test
-%endif
-%endif
+%else
 %define psuffix %{nil}
 %bcond_with test
+%endif
 Name:           scons%{psuffix}
 Version:        3.0.4
 Release:        0
@@ -110,11 +107,15 @@ ls -lh build/lib
 
 %check
 %if %{with test}
+%ifnarch aarch64 armv7l ppc64 ppc64le s390x
 TEMP_FILE=$(mktemp --tmpdir %{modname}-test.XXXXXX)
 trap 'rm -f -- "$TEMP_FILE"' INT TERM HUP EXIT
 find src/ test/ -name \*.py \
     | grep -F -v -f grep-filter-list.txt >$TEMP_FILE
 python3 runtest.py -f $TEMP_FILE
+%else
+echo "Skiping tests on this architecture due to failures"
+%endif
 %endif
 
 %files