diff options
| author |   Michael Halstead <michael@yoctoproject.org> | 2013-02-13 08:31:03 -0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-02-13 16:52:30 +0000 |
| commit | 7ed7eae8788447a5aeebe694a5c7c43949d58f15 (patch) | |
| tree | 4d044c194623cd662b319671e5b53e5b43d4bdbf /scripts | |
| parent | f3df2542dd65cd6be3ca611fdf1ae7b0845d0f08 (diff) | |
| download | openembedded-core-contrib-7ed7eae8788447a5aeebe694a5c7c43949d58f15.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: 4cea35cc4e4ed8e68cd117825b1dd4ef1be768c2)
Signed-off-by: Michael Halstead <michael@yoctoproject.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/qemuimage-testlib | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/scripts/qemuimage-testlib b/scripts/qemuimage-testlib index 7bdaa4fb5d..f8a5299a25 100755 --- a/scripts/qemuimage-testlib +++ b/scripts/qemuimage-testlib @@ -220,7 +220,7 @@ Test_Kill_Qemu() declare local pid # Check if $1 pid exists and is a qemu process - ps -fp $PID | grep -iq "qemu" + ps -wwfp $PID | grep -iq "qemu" # Find all children pid of the pid $1 if [ $? -eq 0 ]; then @@ -383,7 +383,7 @@ Test_Fetch_Target_IP() declare local pid # Check if $1 pid exists and contains ipaddr of target - ps -fp $opid | grep -oq "192\.168\.7\.[0-9]*::" + ps -wwfp $opid | grep -oq "192\.168\.7\.[0-9]*::" # Find all children pid of the pid $1 # and check if they contain ipaddr of target @@ -408,14 +408,14 @@ Test_Fetch_Target_IP() while [ $i -ne 0 ] do i=$((i-1)) - ps -fp ${pid[$i]} | grep -oq "192\.168\.7\.[0-9]*::" + ps -wwfp ${pid[$i]} | grep -oq "192\.168\.7\.[0-9]*::" if [ $? -eq 0 ]; then - ip_addr=`ps -fp ${pid[$i]} | grep -o "192\.168\.7\.[0-9]*::" | awk -F":" '{print $1}'` + ip_addr=`ps -wwfp ${pid[$i]} | grep -o "192\.168\.7\.[0-9]*::" | awk -F":" '{print $1}'` fi sleep 1 done else - ip_addr=`ps -fp $opid | grep -o "192\.168\.7\.[0-9]*::" | awk -F":" '{print $1}'` + ip_addr=`ps -wwfp $opid | grep -o "192\.168\.7\.[0-9]*::" | awk -F":" '{print $1}'` fi echo $ip_addr |