Attachment 919500 Details for Bug 1115953 – Resolve errors from QE test harness

[patch] Resolve errors from QE test harness

rlIsRHEL7.patch (text/plain), 1.00 KB, created by Nathan Scott on 2014-07-21 01:47:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nathan Scott

Created: 2014-07-21 01:47:36 UTC

Size: 1.00 KB

patch

obsolete

>diff --git a/Library/pcpcommon/lib.sh b/Library/pcpcommon/lib.sh
>index 2bf2400..a55f0fd 100755
>--- a/Library/pcpcommon/lib.sh
>+++ b/Library/pcpcommon/lib.sh
>@@ -95,7 +95,7 @@ function pcpcommon_setup () {
> 
>     rlAssertRpm --all
> 
>-    rlIsRHEL7 && rlRun "modprobe loop" 0 "loop module is required by some testcases"
>+    rlIsRHEL 7 && rlRun "modprobe loop" 0 "loop module is required by some testcases"
> 
>     rlRun "pcpcommon_TMPDIR=`mktemp -d`" 0 "Creating tmp directory"
> 
>@@ -166,7 +166,7 @@ EOF
>     rlRun "chown -R $pcpcommon_TESTSUITE_USER $pcpcommon_TMPDIR"
> 
>     # Setup X Window System - not only pcp-gui-testsuite requires this
>-    rlIsRHEL7 && rlRun "cp /etc/X11/xinit/xinitrc $pcpcommon_TESTSUITE_USER_HOME/.xinitrc"
>+    rlIsRHEL 7 && rlRun "cp /etc/X11/xinit/xinitrc $pcpcommon_TESTSUITE_USER_HOME/.xinitrc"
>     rlRun "su - -c 'Xvfb :0 &> $pcpcommon_TMPDIR/xvfb.log &' $pcpcommon_TESTSUITE_USER"
>     rlRun "sleep 30"
>     rlRun "pcpcommon_XVFB_PID=`ps xa | grep Xvfb | grep -v grep | awk '{print $1}'`"

Actions: View | Diff

Attachments on bug 1115953: 919500 | 924351