From 4a8ad6deaf152a5ff48737b30833bb321fb20657 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Wed, 27 Mar 2024 11:08:50 +0100 Subject: [PATCH] Add -tests subpackage with unit tests that can run in CI Resolves: RHEL-28239 --- qt6-qttools.spec | 38 +++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/qt6-qttools.spec b/qt6-qttools.spec index 6e98c9f..e394175 100644 --- a/qt6-qttools.spec +++ b/qt6-qttools.spec @@ -7,11 +7,12 @@ %endif %global examples 1 +%global build_tests 1 Summary: Qt6 - QtTool components Name: qt6-qttools Version: 6.6.1 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 Url: http://www.qt.io @@ -150,6 +151,15 @@ Requires: %{name}-common = %{version}-%{release} %{summary}. %endif +%if 0%{?build_tests} +%package tests +Summary: Unit tests for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description tests +%{summary}. +%endif + %prep %setup -q -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} @@ -159,14 +169,28 @@ Requires: %{name}-common = %{version}-%{release} %endif %build -%cmake_qt6 -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} +%cmake_qt6 \ + -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \ + -DQT_BUILD_TESTS=%{?build_tests:ON}%{!?build_tests:OFF} + +%if 0%{?build_tests} +%qt6_fix_tests +%endif %cmake_build %install +%if 0%{?build_tests} +%qt6_dont_autoinstall_tests +%endif + %cmake_install +%if 0%{?build_tests} +%qt6_install_tests +%endif + # Add desktop files, --vendor=... helps avoid possible conflicts with qt3/qt4 desktop-file-install \ --dir=%{buildroot}%{_datadir}/applications \ @@ -330,6 +354,7 @@ popd %{_qt6_libdir}/libQt6UiTools.so %{_qt6_libdir}/cmake/Qt6/FindWrapLibClang.cmake %{_qt6_libdir}/cmake/Qt6BuildInternals/StandaloneTests/QtToolsTestsConfig.cmake +%dir %{_qt6_libdir}/cmake/Qt6Designer %{_qt6_libdir}/cmake/Qt6Designer/*.cmake %{_qt6_libdir}/cmake/Qt6DesignerComponentsPrivate/*.cmake %dir %{_qt6_libdir}/cmake/Qt6QDocCatchPrivate @@ -380,11 +405,18 @@ popd %if 0%{?examples} %files examples %{_qt6_examplesdir}/ -%dir %{_qt6_libdir}/cmake/Qt6Designer %endif +%if 0%{?build_tests} +%files tests +%{_qt6_archdatadir}/tests +%endif %changelog +* Wed Mar 27 2024 Jan Grulich - 6.6.1-3 +- Add -tests subpackage with unit tests that can run in CI + Resolves: RHEL-28239 + * Mon Jan 22 2024 Fedora Release Engineering - 6.6.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild