Browse code
Fix gcovr %check
Change-Id: I16d96c25b834eacfa39a2b203be7c660b7161510
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/6226
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Sharath George
ashwin-h authored on 2018/11/23 10:22:59Showing 1 changed files
| ... | ... |
@@ -4,7 +4,7 @@ |
| 4 | 4 |
Summary: The gcovr command provides a utility for managing the use of the GNU gcov utility |
| 5 | 5 |
Name: gcovr |
| 6 | 6 |
Version: 4.1 |
| 7 |
-Release: 1%{?dist}
|
|
| 7 |
+Release: 2%{?dist}
|
|
| 8 | 8 |
License: BSD Clause-3 |
| 9 | 9 |
URL: http://gcovr.com/ |
| 10 | 10 |
Source0: https://github.com/gcovr/gcovr/archive/%{name}-%{version}.tar.gz
|
| ... | ... |
@@ -16,6 +16,22 @@ BuildRequires: python2 |
| 16 | 16 |
BuildRequires: python2-libs |
| 17 | 17 |
BuildRequires: python2-devel |
| 18 | 18 |
BuildRequires: python-setuptools |
| 19 |
+BuildRequires: python3-devel |
|
| 20 |
+BuildRequires: python3 |
|
| 21 |
+BuildRequires: python3-libs |
|
| 22 |
+BuildRequires: python3-setuptools |
|
| 23 |
+BuildRequires: python3-xml |
|
| 24 |
+%if %{with_check}
|
|
| 25 |
+BuildRequires: openssl-devel |
|
| 26 |
+BuildRequires: curl-devel |
|
| 27 |
+BuildRequires: python-pytest |
|
| 28 |
+BuildRequires: python3-pytest |
|
| 29 |
+BuildRequires: python-six |
|
| 30 |
+BuildRequires: python3-six |
|
| 31 |
+BuildRequires: python-attrs |
|
| 32 |
+BuildRequires: python3-attrs |
|
| 33 |
+BuildRequires: python-xml |
|
| 34 |
+%endif |
|
| 19 | 35 |
Requires: python2 |
| 20 | 36 |
Requires: python2-libs |
| 21 | 37 |
Buildarch: noarch |
| ... | ... |
@@ -24,11 +40,6 @@ The gcovr command provides a utility for managing the use of the GNU gcov utilit |
| 24 | 24 |
|
| 25 | 25 |
%package -n python3-gcovr |
| 26 | 26 |
Summary: python3-gcovr |
| 27 |
-BuildRequires: python3-devel |
|
| 28 |
-BuildRequires: python3 |
|
| 29 |
-BuildRequires: python3-libs |
|
| 30 |
-BuildRequires: python3-setuptools |
|
| 31 |
-BuildRequires: python3-xml |
|
| 32 | 27 |
Requires: python3 |
| 33 | 28 |
Requires: python3-libs |
| 34 | 29 |
%description -n python3-gcovr |
| ... | ... |
@@ -54,8 +65,16 @@ python2 setup.py install --skip-build --prefix=%{_prefix} --root=%{buildroot}
|
| 54 | 54 |
|
| 55 | 55 |
|
| 56 | 56 |
%check |
| 57 |
+easy_install_2=$(ls /usr/bin |grep easy_install |grep 2) |
|
| 58 |
+$easy_install_2 funcsigs pathlib2 pluggy utils atomicwrites more_itertools |
|
| 59 |
+$easy_install_2 pyutilib |
|
| 57 | 60 |
python2 setup.py test |
| 61 |
+pushd ../p3dir |
|
| 62 |
+easy_install_3=$(ls /usr/bin |grep easy_install |grep 3) |
|
| 63 |
+$easy_install_3 funcsigs pathlib2 pluggy utils atomicwrites more_itertools |
|
| 64 |
+$easy_install_3 pyutilib |
|
| 58 | 65 |
python3 setup.py test |
| 66 |
+popd |
|
| 59 | 67 |
|
| 60 | 68 |
%files |
| 61 | 69 |
%defattr(-,root,root) |
| ... | ... |
@@ -70,6 +89,8 @@ python3 setup.py test |
| 70 | 70 |
%{python3_sitelib}*
|
| 71 | 71 |
|
| 72 | 72 |
%changelog |
| 73 |
+* Wed Nov 21 2018 Ashwin H <ashwinh@vmware.com> 4.1-2 |
|
| 74 |
+- Fix gcovr %check |
|
| 73 | 75 |
* Tue Sep 18 2018 Sujay G <gsujay@vmware.com> 4.1-1 |
| 74 | 76 |
- Bump gcovr version to 4.1 |
| 75 | 77 |
* Fri Jun 09 2017 Harish Udaiya Kumar <hudaiyakumar@vmware.com> 3.3-1 |