[oe-commits] Michael Halstead : scripts/qemuimage-testlib: Use wide option to ps calls

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: danny
Commit: 4d2164494fba2c4c3016fe196f986161a71f70cb
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=4d2164494fba2c4c3016fe196f986161a71f70cb

Author: Michael Halstead <michael at yoctoproject.org>
Date:   Wed Feb 13 08:31:03 2013 -0800

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 at yoctoproject.org>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 scripts/qemuimage-testlib |   10 +++++-----
 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()
 	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