From 6c06d62554c7e6da695ded0c5821db29f2bc17f7a396bb4830a3af046bc884f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 25 Sep 2018 06:58:17 +0000 Subject: [PATCH] Accepting request 636158 from home:olh:branches:openSUSE:Tools - Wrap make check in bcond obs_scm_testsuite OBS-URL: https://build.opensuse.org/request/show/636158 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/obs-service-set_version?expand=0&rev=89 --- obs-service-set_version.changes | 5 +++++ obs-service-set_version.spec | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/obs-service-set_version.changes b/obs-service-set_version.changes index 0b5e294..a170985 100644 --- a/obs-service-set_version.changes +++ b/obs-service-set_version.changes @@ -4,6 +4,11 @@ Wed Sep 19 06:28:24 UTC 2018 - adrian@suse.de - Update to version 0.5.10: * fix zipfile crash also for python2.7 +------------------------------------------------------------------- +Mon Sep 17 10:21:44 UTC 2018 - olaf@aepfle.de + +- Wrap make check in bcond obs_scm_testsuite + ------------------------------------------------------------------- Mon Sep 17 09:28:09 UTC 2018 - adrian@suse.de diff --git a/obs-service-set_version.spec b/obs-service-set_version.spec index 6083b54..d4b4c54 100644 --- a/obs-service-set_version.spec +++ b/obs-service-set_version.spec @@ -15,7 +15,7 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # - +%bcond_without obs_scm_testsuite %define service set_version Name: obs-service-%{service} @@ -26,9 +26,10 @@ License: GPL-2.0-or-later Group: Development/Tools/Building Url: https://github.com/openSUSE/obs-service-%{service} Source: %{name}-%{version}.tar.gz +%if %{with obs_scm_testsuite} BuildRequires: python3-ddt BuildRequires: python3-flake8 -BuildRequires: python3-packaging +%endif %if 0%{?suse_version} %if 0%{?suse_version} > 1315 Recommends: python3-packaging @@ -55,8 +56,10 @@ a given version or to the existing files. sed -i -e "1 s,#!/usr/bin/python$,#!/usr/bin/python3," set_version %endif +%if %{with obs_scm_testsuite} %check make test PYTHON=python3 +%endif %install mkdir -p %{buildroot}%{_prefix}/lib/obs/service