aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Halstead <michael@yoctoproject.org>2013-02-13 08:31:03 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-13 16:43:42 +0000
commit4cea35cc4e4ed8e68cd117825b1dd4ef1be768c2 (patch)
treed7d0c2a508ccf18c70ea5a4b28c86255c09e5384
parent1c5646dde09008662f064ce7e7400c4d68775278 (diff)
downloadopenembedded-core-contrib-4cea35cc4e4ed8e68cd117825b1dd4ef1be768c2.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. 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 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