Attachment 924351 Details for Bug 1115953 – Additional rpm dependencies for PCP QA testing

[patch] Additional rpm dependencies for PCP QA testing

qe-tests-extradeps.patch (text/plain), 2.98 KB, created by Nathan Scott on 2014-08-06 05:17:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nathan Scott

Created: 2014-08-06 05:17:56 UTC

Size: 2.98 KB

patch

obsolete

>diff --git a/Library/pcpcommon/lib.sh b/Library/pcpcommon/lib.sh
>index a55f0fd..388435b 100755
>--- a/Library/pcpcommon/lib.sh
>+++ b/Library/pcpcommon/lib.sh
>@@ -43,10 +43,8 @@ fi
> 
> if [ -z "$REQUIRES" ]; then
>     REQUIRES="bind-utils net-tools nmap systemtap-devel valgrind \
>-      xorg-x11-server-Xvfb metacity \
>-      abrt abrt-cli abrt-addon-ccpp abrt-addon-vmcore"
>-
>-    rlIsRHEL 7 && REQUIRES="$REQUIRES gfs2-utils"
>+      xorg-x11-server-Xvfb metacity xfsprogs gfs2-utils device-mapper \
>+      avahi avahi-tools abrt abrt-cli abrt-addon-ccpp abrt-addon-vmcore"
> fi
> 
> pcpcommon_TESTSUITE_DIR=${pcpcommon_TESTSUITE_DIR:-/var/lib/pcp/testsuite}
>diff --git a/Sanity/pcp-testsuite-light/Makefile b/Sanity/pcp-testsuite-light/Makefile
>index d368e79..47e5466 100644
>--- a/Sanity/pcp-testsuite-light/Makefile
>+++ b/Sanity/pcp-testsuite-light/Makefile
>@@ -58,7 +58,7 @@ $(METADATA): Makefile
> 	@echo "Requires:        pcp pcp-gui pcp-libs pcp-manager pcp-import-collectl2pcp pcp-import-iostat2pcp pcp-import-mrtg2pcp pcp-import-sar2pcp" >> $(METADATA)
> 	@echo "Requires:        perl-PCP-LogImport perl-PCP-LogSummary perl-PCP-MMV perl-PCP-PMDA pcp-pmda-infiniband pcp-testsuite pcp-webapi python-pcp" >> $(METADATA)
> 	@echo "Requires:        pcp-doc pcp-libs-devel pcp-debuginfo" >> $(METADATA)
>-	@echo "Requires:        bind-utils net-tools nmap systemtap-devel valgrind xorg-x11-server-Xvfb metacity abrt abrt-cli abrt-addon-ccpp abrt-addon-vmcore" >> $(METADATA)
>+	@echo "Requires:        bind-utils net-tools nmap systemtap-devel valgrind xorg-x11-server-Xvfb metacity abrt abrt-cli abrt-addon-ccpp abrt-addon-vmcore device-mapper gfs2-utils xfsprogs avahi avahi-tools" >> $(METADATA)
> 	@echo "RhtsRequires:    library(pcp/pcpcommon)" >> $(METADATA)
> 	@echo "Releases:        RHEL6 RHEL7" >> $(METADATA)
> 	@echo "Priority:        Normal" >> $(METADATA)
>diff --git a/Sanity/pcp-testsuite/Makefile b/Sanity/pcp-testsuite/Makefile
>index 124ff76..1a678df 100644
>--- a/Sanity/pcp-testsuite/Makefile
>+++ b/Sanity/pcp-testsuite/Makefile
>@@ -58,7 +58,7 @@ $(METADATA): Makefile
> 	@echo "Requires:        pcp pcp-gui pcp-libs pcp-manager pcp-import-collectl2pcp pcp-import-iostat2pcp pcp-import-mrtg2pcp pcp-import-sar2pcp" >> $(METADATA)
> 	@echo "Requires:        perl-PCP-LogImport perl-PCP-LogSummary perl-PCP-MMV perl-PCP-PMDA pcp-pmda-infiniband pcp-testsuite pcp-webapi python-pcp" >> $(METADATA)
> 	@echo "Requires:        pcp-doc pcp-libs-devel pcp-debuginfo" >> $(METADATA)
>-	@echo "Requires:        bind-utils net-tools nmap systemtap-devel valgrind xorg-x11-server-Xvfb metacity abrt abrt-cli abrt-addon-ccpp abrt-addon-vmcore gfs2-utils" >> $(METADATA)
>+	@echo "Requires:        bind-utils net-tools nmap systemtap-devel valgrind xorg-x11-server-Xvfb metacity abrt abrt-cli abrt-addon-ccpp abrt-addon-vmcore device-mapper gfs2-utils xfsprogs avahi avahi-tools" >> $(METADATA)
> 	@echo "RhtsRequires:    library(pcp/pcpcommon)" >> $(METADATA)
> 	@echo "Releases:        RHEL7" >> $(METADATA)
> 	@echo "Priority:        Normal" >> $(METADATA)

Actions: View | Diff

Attachments on bug 1115953: 919500 | 924351