diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2013-03-26 12:43:04 +0000 | 
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-26 17:50:08 +0000 | 
| commit | b45d63e2ecbc03c1aaebb619e3eea840e163699b (patch) | |
| tree | 6c487d91ff1335bdee18d89b0ef9d29e8490b920 | |
| parent | 60c8b258d8b1b862a4cd674c88b2d93803a460fa (diff) | |
| download | poky-b45d63e2ecbc03c1aaebb619e3eea840e163699b.tar.gz | |
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: 7c2137a07cca8e1d40d3c8b4b2c6321d80f2b1de)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rwxr-xr-x | scripts/qemuimage-testlib | 2 | ||||
| -rwxr-xr-x | scripts/qemuimage-testlib-pythonhelper | 2 | 
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() | |||
| 420 | 420 | ||
| 421 | while [ ${up_time} -lt 10 ] | 421 | while [ ${up_time} -lt 10 ] | 
| 422 | do | 422 | do | 
| 423 | QEMUPID=`qemuimage-testlib-pythonhelper --findqemu $XTERMPID` | 423 | QEMUPID=`qemuimage-testlib-pythonhelper --findqemu $XTERMPID 2>/dev/null` | 
| 424 | if [ $? -ne 0 ]; then | 424 | if [ $? -ne 0 ]; then | 
| 425 | Test_Info "Wait for qemu up..." | 425 | Test_Info "Wait for qemu up..." | 
| 426 | up_time=`expr $up_time + 5` | 426 | 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: | |||
| 34 | commands[data[0]] = data[2] | 34 | commands[data[0]] = data[2] | 
| 35 | 35 | ||
| 36 | if options.findqemu not in pids: | 36 | if options.findqemu not in pids: | 
| 37 | print "No children found matching %s" % options.findqemu | 37 | sys.stderr.write("No children found matching %s" % options.findqemu) | 
| 38 | sys.exit(1) | 38 | sys.exit(1) | 
| 39 | 39 | ||
| 40 | parents = [] | 40 | parents = [] | 
