Don’t conditionalize the pytest-xdist BR on architecture

This commit is contained in:
Benjamin A. Beasley 2023-10-13 08:12:52 -04:00
parent 56a9b3536d
commit 8b3688c4be
1 changed files with 8 additions and 7 deletions

View File

@ -49,15 +49,8 @@ BuildRequires: python3-scipy
# these packages are not included in RHEL
%if %{undefined rhel}
# Running tests in serial makes memory errors, which occur in some tests on
# 32-bit architectures, more reproducible, and makes the output when they occur
# less confusing: we tend to get individual test failures rather than a pytest
# INTERNALERROR.
%if 0%{?__isa_bits} != 32
# this is used for supporting -n auto in %%pytest
BuildRequires: python3-pytest-xdist
%global use_pytest_xdist 1
%endif
# this is only used to test integration with ipython
BuildRequires: /usr/bin/ipython
%endif
@ -155,6 +148,14 @@ k="$k and not test_setup_bdist_install3"
k="$k and not test_setup_build3"
k="$k and not test_setup_sdist_install3"
# Dont run tests in parallel on 32-bit architecutres. RRunning tests in serial
# makes memory errors, which occur in some tests on 32-bit architectures, more
# reproducible, and makes the output when they occur less confusing: we tend to
# get individual test failures rather than a pytest INTERNALERROR.
%if %{undefined rhel} && 0%{?__isa_bits} != 32
%global use_pytest_xdist 1
%endif
%pytest %{?use_pytest_xdist:-n auto} -k "$k"