diff -r 43ffed8669ce -r bed9ffa7f33a tests/Makefile.am --- a/tests/Makefile.am Wed Jun 22 17:04:28 2016 +0100 +++ b/tests/Makefile.am Tue Jun 28 19:46:19 2016 +0100 @@ -4,6 +4,12 @@ zappy2.spec unsatisfiable.spec uninstallable.spec badpostun.spec comps.xml \ glib.supp.in README xvfb-run +pkg_V_rpmbuild = $(pkg_v_rpmbuild_$(V)) +pkg_v_rpmbuild_ = $(pkg_v_rpmbuild_$(AM_DEFAULT_VERBOSITY)) +pkg_v_rpmbuild_0 = --quiet + +BUILD_RPM = $(RPMBUILD) $(pkg_V_rpmbuild) --define "_topdir `pwd`/rpmbuild" -bb + if HAVE_CHECK_TOOLS noinst_DATA = glib.supp yum-repo-test-dir/repodata/primary.xml.gz \ @@ -22,21 +28,16 @@ uninstallable.spec badpostun.spec Makefile rm -rf rpmbuild yum-repo-test-dir mkdir -p rpmbuild/BUILD rpmbuild/RPMS - $(RPMBUILD) --define "_topdir `pwd`/rpmbuild" -bb $(srcdir)/zap.spec - $(RPMBUILD) --define "_topdir `pwd`/rpmbuild" --define "_version 1" \ - -bb $(srcdir)/zip.spec - $(RPMBUILD) --define "_topdir `pwd`/rpmbuild" -bb $(srcdir)/zsh.spec - $(RPMBUILD) --define "_topdir `pwd`/rpmbuild" -bb $(srcdir)/zsh2.spec - $(RPMBUILD) --define "_topdir `pwd`/rpmbuild" -bb \ - $(srcdir)/filesystem.spec - $(RPMBUILD) --define "_topdir `pwd`/rpmbuild" -bb $(srcdir)/zappy.spec - $(RPMBUILD) --define "_topdir `pwd`/rpmbuild" -bb $(srcdir)/zappy2.spec - $(RPMBUILD) --define "_topdir `pwd`/rpmbuild" -bb \ - $(srcdir)/unsatisfiable.spec - $(RPMBUILD) --define "_topdir `pwd`/rpmbuild" -bb \ - $(srcdir)/uninstallable.spec - $(RPMBUILD) --define "_topdir `pwd`/rpmbuild" -bb \ - $(srcdir)/badpostun.spec + $(BUILD_RPM) $(srcdir)/zap.spec + $(BUILD_RPM) --define "_version 1" $(srcdir)/zip.spec + $(BUILD_RPM) $(srcdir)/zsh.spec + $(BUILD_RPM) $(srcdir)/zsh2.spec + $(BUILD_RPM) $(srcdir)/filesystem.spec + $(BUILD_RPM) $(srcdir)/zappy.spec + $(BUILD_RPM) $(srcdir)/zappy2.spec + $(BUILD_RPM) $(srcdir)/unsatisfiable.spec + $(BUILD_RPM) $(srcdir)/uninstallable.spec + $(BUILD_RPM) $(srcdir)/badpostun.spec mkdir -p yum-repo-test-dir/rpms mv rpmbuild/RPMS/noarch/*.rpm yum-repo-test-dir/rpms rm -rf rpmbuild