Browse code

Modified %check for SPEC files - 5

Change-Id: I0ab207f3c15fa0f8d6a27f929911f0ac4637b0d1
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/1396
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Siju Maliakkal <smaliakkal@vmware.com>

Chang authored on 2016/09/17 06:13:27
Showing 10 changed files
... ...
@@ -32,8 +32,7 @@ install -v -d -m755 %{buildroot}/usr/share/xml/docbook/%{name}-%{version}
32 32
 install -v -d -m755 %{buildroot}/etc/xml
33 33
 chown -R root:root .
34 34
 cp -v -af docbook.cat *.dtd ent/ *.mod %{buildroot}/usr/share/xml/docbook/%{name}-%{version}
35
-%check
36
-make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
35
+
37 36
 %post
38 37
 if [ ! -e /etc/xml/docbook ]; then
39 38
     xmlcatalog --noout --create /etc/xml/docbook
... ...
@@ -37,7 +37,8 @@ install -v -m644 -D README \
37 37
 install -v -m644    RELEASE-NOTES* NEWS* \
38 38
                     %{buildroot}%{_docdir}/%{name}-%{version}
39 39
 %check
40
-make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
40
+chmod 777 tests -R  
41
+make %{?_smp_mflags} check 
41 42
 
42 43
 %post
43 44
 if [ ! -d /etc/xml ]; then install -v -m755 -d /etc/xml; fi &&
... ...
@@ -30,8 +30,7 @@ install -vdm 755 %{buildroot}%{_datadir}/bash-completion/completions
30 30
 install -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/bash-completion/completions/docker
31 31
 
32 32
 %{_fixperms} %{buildroot}/*
33
-%check
34
-make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
33
+
35 34
 %preun
36 35
 %systemd_preun docker.service
37 36
 %systemd_preun docker-containerd.service
... ...
@@ -48,7 +48,8 @@ popd
48 48
 
49 49
 %check
50 50
 cd build
51
-make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
51
+make %{?_smp_mflags} check
52
+
52 53
 %post
53 54
 /sbin/ldconfig
54 55
 %postun
... ...
@@ -37,6 +37,9 @@ easy_install ./
37 37
     --root "%{buildroot}" \
38 38
     --single-version-externally-managed
39 39
 
40
+%check
41
+python setup.py test
42
+
40 43
 %clean
41 44
 %{__rm} -rf %{buildroot}
42 45
 
... ...
@@ -26,6 +26,9 @@ make DESTDIR=%{buildroot} \
26 26
     PREFIX=%{_prefix} \
27 27
     install 
28 28
 
29
+%check
30
+make %{?_smp_mflags} test
31
+
29 32
 %clean
30 33
 rm -rf %{buildroot}/*
31 34
 %files 
... ...
@@ -126,7 +126,7 @@ chmod +x ${RPM_BUILD_ROOT}/usr/lib/elfutils/lib*.so*
126 126
 %find_lang %{name}
127 127
 
128 128
 %check
129
-make check
129
+make %{?_smp_mflags} check
130 130
 
131 131
 %clean
132 132
 rm -rf ${RPM_BUILD_ROOT}
... ...
@@ -36,9 +36,6 @@ mv %{_builddir}/%{name}-v%{version}-linux-amd64/README-etcdctl.md %{buildroot}/%
36 36
 cp %{SOURCE1} %{buildroot}/lib/systemd/system
37 37
 install -vdm755 %{buildroot}/var/lib/etcd
38 38
 
39
-%check
40
-make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
41
-
42 39
 %post	-p /sbin/ldconfig
43 40
 
44 41
 %postun	-p /sbin/ldconfig
... ...
@@ -26,6 +26,9 @@ make %{?_smp_mflags}
26 26
 %install
27 27
 make install DESTDIR=%{buildroot}
28 28
 
29
+%check
30
+make %{?_smp_mflags} check
31
+
29 32
 %clean
30 33
 rm -rf %{buildroot}/*
31 34
  
... ...
@@ -41,7 +41,7 @@ make %{?_smp_mflags}
41 41
 %makeinstall
42 42
 
43 43
 %check
44
-make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
44
+make %{?_smp_mflags} check
45 45
 
46 46
 %clean
47 47
 rm -rf %{buildroot}/*