1. photon
  2. Commit 78547c0131ccb843b8e9d10f5b5ab1b930ce9992
Browse code

Modified %check for SPEC files - 7

Change-Id: Ifd9b747853be059f634e52f6558123f3ece15fce
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/1399
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Danut Moraru <dmoraru@vmware.com>

Chang authored on 2016/09/17 06:28:26
Showing 10 changed files
SPECS/gdbm/gdbm.spec
History View file @ 78547c0
... ... 
@@ -27,8 +27,10 @@ make DESTDIR=%{buildroot} install
27 27 
 find %{buildroot}%{_libdir} -name '*.la' -delete
28 28 
 rm -rf %{buildroot}%{_infodir}
29 29 
 %find_lang %{name}
30 
+
30 31 
 %check
31 
-make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
32 
+make %{?_smp_mflags} check
33 
+
32 34 
 %post	-p /sbin/ldconfig
33 35 
 %postun	-p /sbin/ldconfig
34 36 
 %files -f %{name}.lang
SPECS/gettext/gettext.spec
History View file @ 78547c0
... ... 
@@ -29,7 +29,8 @@ rm -rf %{buildroot}%{_infodir}
29 29 
 %find_lang %{name} --all-name
30 30
31 31 
 %check
32 
-make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
32 
+make %{?_smp_mflags} check
33 
+
33 34 
 %post	-p /sbin/ldconfig
34 35 
 %postun	-p /sbin/ldconfig
35 36 
 %files -f %{name}.lang
SPECS/git/git.spec
History View file @ 78547c0
... ... 
@@ -57,8 +57,9 @@ install -vdm 755 %{buildroot}/usr/share/bash-completion/completions
57 57 
 install -m 0644 contrib/completion/git-completion.bash %{buildroot}/usr/share/bash-completion/completions/git
58 58 
 %find_lang %{name}
59 59 
 %{_fixperms} %{buildroot}/*
60 
+
60 61 
 %check
61 
-make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
62 
+make %{?_smp_mflags} test
62 63
63 64 
 %post
64 65 
 if [ $1 -eq 1 ];then
SPECS/glibc/glibc.spec
History View file @ 78547c0
... ... 
@@ -94,9 +94,11 @@ cd %{_builddir}/%{name}-build
94 94 
 	--enable-obsolete-rpc \
95 95 
 	--disable-silent-rules
96 96 
 make %{?_smp_mflags}
97 
+
97 98 
 %check
98 99 
 cd %{_builddir}/glibc-build
99 
-make -k check > %{_topdir}/LOGS/%{name}-check.log 2>&1 || true
100 
+make %{?_smp_mflags} check
101 
+
100 102 
 %install
101 103 
 #	Do not remove static libs
102 104 
 pushd %{_builddir}/glibc-build
SPECS/gmp/gmp.spec
History View file @ 78547c0
... ... 
@@ -41,8 +41,10 @@ install -vdm 755 %{buildroot}%{_defaultdocdir}/%{name}-%{version}
41 41 
 cp -v doc/{isa_abi_headache,configuration} doc/*.html %{buildroot}%{_defaultdocdir}/%{name}-%{version}
42 42 
 find %{buildroot}%{_libdir} -name '*.la' -delete
43 43 
 rm -rf %{buildroot}%{_infodir}
44 
+
44 45 
 %check
45 
-make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
46 
+make %{?_smp_mflags} check
47 
+
46 48 
 %post -p /sbin/ldconfig
47 49 
 %postun -p /sbin/ldconfig
48 50 
 %files
SPECS/gnome-common/gnome-common.spec
History View file @ 78547c0
... ... 
@@ -26,7 +26,7 @@ make %{?_smp_mflags}
26 26 
 make DESTDIR=%{buildroot} install
27 27
28 28 
 %check
29 
-make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
29 
+make %{?_smp_mflags} check
30 30
31 31 
 %post	-p /sbin/ldconfig
32 32
SPECS/gnutls/gnutls.spec
History View file @ 78547c0
... ... 
@@ -50,7 +50,7 @@ rm %{buildroot}%{_infodir}/*
50 50 
 find %{buildroot}%{_libdir} -name '*.la' -delete
51 51
52 52 
 %check
53 
-make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
53 
+make %{?_smp_mflags} check
54 54
55 55 
 %post
56 56 
 /sbin/ldconfig
SPECS/gperf/gperf.spec
History View file @ 78547c0
... ... 
@@ -26,8 +26,10 @@ pushd  %{buildroot}/usr/share/info &&
26 26 
     install-info $FILENAME %{name}-%{version} 2>/dev/null
27 27 
   done &&
28 28 
 popd
29 
+
29 30 
 %check
30 
-make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
31 
+make %{?_smp_mflags} check
32 
+
31 33 
 %files
32 34 
 %defattr(-,root,root)
33 35 
 %{_docdir}/%{name}-%{version}/*
SPECS/gpgme/gpgme.spec
History View file @ 78547c0
... ... 
@@ -35,6 +35,10 @@ make %{?_smp_mflags}
35 35 
 make DESTDIR=%{buildroot} install
36 36 
 rm %{buildroot}/%{_libdir}/*.la
37 37 
 rm -rf %{buildroot}/%{_infodir}
38 
+
39 
+%check
40 
+cd tests && make check-TESTS
41 
+
38 42 
 %post	-p /sbin/ldconfig
39 43 
 %postun	-p /sbin/ldconfig
40 44 
 %files
SPECS/gptfdisk/gptfdisk.spec
History View file @ 78547c0
... ... 
@@ -29,8 +29,10 @@ make %{?_smp_mflags} POPT=1
29 29 
 [ %{buildroot} != "/"] && rm -rf %{buildroot}/*
30 30 
 make DESTDIR=%{buildroot} install POPT=1
31 31 
 %{_fixperms} %{buildroot}/*
32 
+
32 33 
 %check
33 
-make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
34 
+make %{?_smp_mflags} test
35 
+
34 36 
 %post	-p /sbin/ldconfig
35 37 
 %postun	-p /sbin/ldconfig
36 38 
 %clean