From 2f3e37ebe9e7f9c1c30045649bdfda1fe7d10bcb Mon Sep 17 00:00:00 2001
From: Chang <changlee@vmware.com>
Date: Fri, 16 Sep 2016 14:34:46 -0700
Subject: [PATCH] Modified %check for SPEC files - 8

Change-Id: I553302023ad793b1e3c9762db81169e7d1807443
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/1400
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: aditij <aditij@vmware.com>
---
 SPECS/gtk-doc/gtk-doc.spec             | 4 ++++
 SPECS/gzip/gzip.spec                   | 4 +++-
 SPECS/haveged/haveged.spec             | 2 +-
 SPECS/iana-etc/iana-etc.spec           | 4 ++++
 SPECS/inetutils/inetutils.spec         | 3 +--
 SPECS/inotify-tools/inotify-tools.spec | 2 ++
 SPECS/intltool/intltool.spec           | 4 +++-
 SPECS/iperf/iperf.spec                 | 3 +++
 SPECS/iptables/iptables.spec           | 2 --
 SPECS/iputils/iputils.spec             | 3 ---
 10 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/SPECS/gtk-doc/gtk-doc.spec b/SPECS/gtk-doc/gtk-doc.spec
index 7a30a5dc5c..71d5acadd2 100644
--- a/SPECS/gtk-doc/gtk-doc.spec
+++ b/SPECS/gtk-doc/gtk-doc.spec
@@ -33,6 +33,10 @@ specially formatted comments from the code to create API documentation.
 make %{?_smp_mflags}
 %install
 make DESTDIR=%{buildroot} sysconfdir=%{_sysconfdir} datadir=%{_datadir} install
+
+%check
+cd tests && make check-TESTS
+
 %files
 %defattr(-,root,root)
 %{_bindir}/*
diff --git a/SPECS/gzip/gzip.spec b/SPECS/gzip/gzip.spec
index d8acddbb87..4eaf0e46c8 100644
--- a/SPECS/gzip/gzip.spec
+++ b/SPECS/gzip/gzip.spec
@@ -27,8 +27,10 @@ install -vdm 755 %{buildroot}%{_bindir}
 mv -v %{buildroot}/bin/{gzexe,uncompress,zcmp,zdiff,zegrep}	%{buildroot}%{_bindir}
 mv -v %{buildroot}/bin/{zfgrep,zforce,zgrep,zless,zmore,znew}	%{buildroot}%{_bindir}
 rm -rf %{buildroot}%{_infodir}
+
 %check
-make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
+make %{?_smp_mflags} check
+
 %files
 %defattr(-,root,root)
 /bin/*
diff --git a/SPECS/haveged/haveged.spec b/SPECS/haveged/haveged.spec
index 8fd7f166b4..e8f824d25e 100644
--- a/SPECS/haveged/haveged.spec
+++ b/SPECS/haveged/haveged.spec
@@ -56,7 +56,7 @@ Headers and shared object symbolic links for the HAVEGE algorithm
 make
 
 %check
-make check
+make %{?_smp_mflags} check
 
 
 %install
diff --git a/SPECS/iana-etc/iana-etc.spec b/SPECS/iana-etc/iana-etc.spec
index 6a43435da7..106bdd7e13 100644
--- a/SPECS/iana-etc/iana-etc.spec
+++ b/SPECS/iana-etc/iana-etc.spec
@@ -18,6 +18,10 @@ The Iana-Etc package provides data for network services and protocols.
 make %{?_smp_mflags}
 %install
 make DESTDIR=%{buildroot} install
+
+%check
+make %{?_smp_mflags} test
+
 %files
 %defattr(-,root,root)
 %config %_sysconfdir/protocols
diff --git a/SPECS/inetutils/inetutils.spec b/SPECS/inetutils/inetutils.spec
index 9bba3ac8e3..2a4e39445b 100644
--- a/SPECS/inetutils/inetutils.spec
+++ b/SPECS/inetutils/inetutils.spec
@@ -29,8 +29,7 @@ make SUIDMODE="-o root -m 755" DESTDIR=%{buildroot} install
 install -vd %{buildroot}%{_sbindir}
 mv -v %{buildroot}%{_bindir}/ifconfig %{buildroot}%{_sbindir}/ifconfig
 rm -rf %{buildroot}%{_infodir}
-%check
-make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
+
 %files
 %defattr(-,root,root)
 %{_bindir}/*
diff --git a/SPECS/inotify-tools/inotify-tools.spec b/SPECS/inotify-tools/inotify-tools.spec
index 9a5e36e4ed..c8cc850569 100644
--- a/SPECS/inotify-tools/inotify-tools.spec
+++ b/SPECS/inotify-tools/inotify-tools.spec
@@ -38,6 +38,8 @@ make
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != '/' ] && rm -rf $RPM_BUILD_ROOT
 %makeinstall
 
+%check
+make %{?_smp_mflags} check
 
 %post -p /sbin/ldconfig
 
diff --git a/SPECS/intltool/intltool.spec b/SPECS/intltool/intltool.spec
index a8838eca73..59c44e6589 100644
--- a/SPECS/intltool/intltool.spec
+++ b/SPECS/intltool/intltool.spec
@@ -21,8 +21,10 @@ make %{?_smp_mflags}
 %install
 make DESTDIR=%{buildroot} install
 install -v -Dm644 doc/I18N-HOWTO %{buildroot}/%{_docdir}/%{name}-%{version}/I18N-HOWTO
+
 %check
-make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
+make %{?_smp_mflags} check
+
 %files
 %defattr(-,root,root)
 %{_docdir}/%{name}-%{version}/I18N-HOWTO
diff --git a/SPECS/iperf/iperf.spec b/SPECS/iperf/iperf.spec
index f9e123010b..44c7640fcf 100644
--- a/SPECS/iperf/iperf.spec
+++ b/SPECS/iperf/iperf.spec
@@ -52,6 +52,9 @@ make %{?_smp_mflags}
 [ %{buildroot} != "/"] && rm -rf %{buildroot}/*
 make DESTDIR=%{buildroot} install
 
+%check
+make %{?_smp_mflags} check
+
 %files
 %defattr(-,root,root)
 %{_bindir}/iperf3
diff --git a/SPECS/iptables/iptables.spec b/SPECS/iptables/iptables.spec
index a9ef1bccc3..14c61cbaf0 100644
--- a/SPECS/iptables/iptables.spec
+++ b/SPECS/iptables/iptables.spec
@@ -54,8 +54,6 @@ chmod 755 %{buildroot}/etc/systemd/scripts/iptables
 find %{buildroot} -name '*.a'  -delete
 find %{buildroot} -name '*.la' -delete
 %{_fixperms} %{buildroot}/*
-%check
-make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
 
 %preun
 %systemd_preun iptables.service
diff --git a/SPECS/iputils/iputils.spec b/SPECS/iputils/iputils.spec
index c4c0a59a19..45e72050c8 100644
--- a/SPECS/iputils/iputils.spec
+++ b/SPECS/iputils/iputils.spec
@@ -53,9 +53,6 @@ iconv -f ISO88591 -t UTF8 RELNOTES -o RELNOTES.tmp
 touch -r RELNOTES RELNOTES.tmp
 mv -f RELNOTES.tmp RELNOTES
 
-%check
-make -k check |& tee %{_specdir}/%{name}-check-log || %{nocheck}
-
 %files
 %defattr(-,root,root)
 %doc RELNOTES