summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Halstead <michael@yoctoproject.org>2013-02-13 16:31:03 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-14 23:08:39 (GMT)
commit046bbc1c9c3cee109bb4d9abafab5fb07480c7e7 (patch)
treec3ec247819226fb6b83935b3ba96fb2f84ddf97e
parent8148ffa15e0721bd85a5b44a0e8494fe48b734a4 (diff)
downloadpoky-046bbc1c9c3cee109bb4d9abafab5fb07480c7e7.tar.gz
scripts/qemuimage-testlib: Use wide option to ps calls
Forcing ps to display unlimited column width allows the qemu IP address to be discovered during sanity testing when the command line is extremely long. This seems to fix the sanity testing problem on AB05 which was recently updated to OpenSUSE 12.2. I'm not sure what about qemu or process listing is different on that distribution but this simpile fix seems to work and my help on other distro's as well. (From OE-Core rev: 4d2164494fba2c4c3016fe196f986161a71f70cb) Signed-off-by: Michael Halstead <michael@yoctoproject.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-xscripts/qemuimage-testlib10
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/qemuimage-testlib b/scripts/qemuimage-testlib
index 7bdaa4f..f8a5299 100755
--- a/scripts/qemuimage-testlib
+++ b/scripts/qemuimage-testlib
@@ -220,7 +220,7 @@ Test_Kill_Qemu()
220 declare local pid 220 declare local pid
221 221
222 # Check if $1 pid exists and is a qemu process 222 # Check if $1 pid exists and is a qemu process
223 ps -fp $PID | grep -iq "qemu" 223 ps -wwfp $PID | grep -iq "qemu"
224 224
225 # Find all children pid of the pid $1 225 # Find all children pid of the pid $1
226 if [ $? -eq 0 ]; then 226 if [ $? -eq 0 ]; then
@@ -383,7 +383,7 @@ Test_Fetch_Target_IP()
383 declare local pid 383 declare local pid
384 384
385 # Check if $1 pid exists and contains ipaddr of target 385 # Check if $1 pid exists and contains ipaddr of target
386 ps -fp $opid | grep -oq "192\.168\.7\.[0-9]*::" 386 ps -wwfp $opid | grep -oq "192\.168\.7\.[0-9]*::"
387 387
388 # Find all children pid of the pid $1 388 # Find all children pid of the pid $1
389 # and check if they contain ipaddr of target 389 # and check if they contain ipaddr of target
@@ -408,14 +408,14 @@ Test_Fetch_Target_IP()
408 while [ $i -ne 0 ] 408 while [ $i -ne 0 ]
409 do 409 do
410 i=$((i-1)) 410 i=$((i-1))
411 ps -fp ${pid[$i]} | grep -oq "192\.168\.7\.[0-9]*::" 411 ps -wwfp ${pid[$i]} | grep -oq "192\.168\.7\.[0-9]*::"
412 if [ $? -eq 0 ]; then 412 if [ $? -eq 0 ]; then
413 ip_addr=`ps -fp ${pid[$i]} | grep -o "192\.168\.7\.[0-9]*::" | awk -F":" '{print $1}'` 413 ip_addr=`ps -wwfp ${pid[$i]} | grep -o "192\.168\.7\.[0-9]*::" | awk -F":" '{print $1}'`
414 fi 414 fi
415 sleep 1 415 sleep 1
416 done 416 done
417 else 417 else
418 ip_addr=`ps -fp $opid | grep -o "192\.168\.7\.[0-9]*::" | awk -F":" '{print $1}'` 418 ip_addr=`ps -wwfp $opid | grep -o "192\.168\.7\.[0-9]*::" | awk -F":" '{print $1}'`
419 fi 419 fi
420 420
421 echo $ip_addr 421 echo $ip_addr