From d76a3f534d2d65d9cc7d6dc02930518a3bd849b0 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 26 Mar 2013 12:43:04 +0000 Subject: 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 Signed-off-by: Richard Purdie --- scripts/qemuimage-testlib | 2 +- scripts/qemuimage-testlib-pythonhelper | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts') 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 = [] -- cgit v1.2.3-54-g00ecf