summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-03-26 12:43:04 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-27 17:28:01 +0000
commitd76a3f534d2d65d9cc7d6dc02930518a3bd849b0 (patch)
treee467c285fa57d4a93411d573f06b380ae599720d
parent317301d146287f20922773b5bf4f59737b60f8af (diff)
downloadpoky-d76a3f534d2d65d9cc7d6dc02930518a3bd849b0.tar.gz
poky-d76a3f534d2d65d9cc7d6dc02930518a3bd849b0.tar.bz2
poky-d76a3f534d2d65d9cc7d6dc02930518a3bd849b0.zip
qemuimagetest: fix erroneous ps errors when qemu couldn't be started
The helper script was printing an error to stdout when it couldn't find any qemu child processes; output this error to stderr instead and redirect stderr to /dev/null when running from qemuimage-testlib so that QEMUPID is actually blank if there are no qemu instances found. (From OE-Core rev: 21edf5ec12d8307c528f157c8e078dbefe25d1ef) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/qemuimage-testlib2
-rwxr-xr-xscripts/qemuimage-testlib-pythonhelper2
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/qemuimage-testlib b/scripts/qemuimage-testlib
index 551011cbaf..6377c7f27a 100755
--- a/scripts/qemuimage-testlib
+++ b/scripts/qemuimage-testlib
@@ -420,7 +420,7 @@ Test_Create_Qemu()
while [ ${up_time} -lt 10 ]
do
- QEMUPID=`qemuimage-testlib-pythonhelper --findqemu $XTERMPID`
+ QEMUPID=`qemuimage-testlib-pythonhelper --findqemu $XTERMPID 2>/dev/null`
if [ $? -ne 0 ]; then
Test_Info "Wait for qemu up..."
up_time=`expr $up_time + 5`
diff --git a/scripts/qemuimage-testlib-pythonhelper b/scripts/qemuimage-testlib-pythonhelper
index 2ca61ca06a..2c1f557778 100755
--- a/scripts/qemuimage-testlib-pythonhelper
+++ b/scripts/qemuimage-testlib-pythonhelper
@@ -34,7 +34,7 @@ if options.findqemu:
commands[data[0]] = data[2]
if options.findqemu not in pids:
- print "No children found matching %s" % options.findqemu
+ sys.stderr.write("No children found matching %s" % options.findqemu)
sys.exit(1)
parents = []