diff --git a/python3-pyside6.spec b/python3-pyside6.spec index 01998e0..4a5bdbc 100644 --- a/python3-pyside6.spec +++ b/python3-pyside6.spec @@ -184,12 +184,17 @@ export LD_LIBRARY_PATH=%{buildroot}%{_qt6_libdir}:$LD_LIBRARY_PATH %if "%{pyside_flavor}" == "pyside6" %define xvfb_command xvfb-run -s "-screen 0 1600x1200x16 -ac +extension GLX +render -noreset" \\ -# Excluded tests (last update: 2022-03-23) +%define excluded_tests 1 +# Excluded tests (last update: 2022-06-22) # registry_existence_test only works on the Qt CI # The QtWebEngineWidgets_pyside-474-qtwebengineview and QtWebEngineCore tests # pass locally but not on the build service (SIGTRAP) # QtGui_qpen_test times out -%define ctest_exclude_regex '(registry_existence_test|QtWebEngineWidgets_pyside-474-qtwebengineview|QtWebEngineCore.*|QtGui_qpen_test)' +ctest_exclude_regex="registry_existence_test|QtWebEngineWidgets_pyside-474-qtwebengineview|QtWebEngineCore.*|QtGui_qpen_test" +# Qt3DExtras_qt3dextras_test fails on aarch64 (exception) and s390x (timeout) +%ifarch aarch64 s390x +ctest_exclude_regex="$ctest_exclude_regex|Qt3DExtras_qt3dextras_test" +%endif %endif pushd sources/%{pyside_flavor} @@ -199,7 +204,7 @@ ctest \ --force-new-ctest-process \ --test-dir %{__qt6_builddir} \ --parallel %{_smp_build_ncpus} \ - %{?ctest_exclude_regex:--exclude-regex %{ctest_exclude_regex}} + %{?excluded_tests:--exclude-regex "($ctest_exclude_regex)"} popd %post -p /sbin/ldconfig