Patchwork [CONSOLIDATED,PULL,v2,20/33] connman_test.sh: Rework for busybox 'ps'

login
register
mail settings
Submitter Saul Wold
Date Aug. 3, 2011, 10:11 p.m.
Message ID <ffde5a4714d24e32ec11ac8a5d003f849aa04011.1312407628.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/9247/
State New, archived
Headers show

Comments

Saul Wold - Aug. 3, 2011, 10:11 p.m.
From: Tom Rini <tom_rini@mentor.com>

This script has two problems today.  First, it does 'ps -ef cmd'
in failure which real ps doesn't grok and busybox ps just ignores
the argument on.  Switch that to 'ps -ef'.  Second, busybox ps -o
doesn't understand cmd but does understand comm.  Using comm lets
us simplify the test logic as well, so switch to that.

Signed-off-by: Tom Rini <tom_rini@mentor.com>
---
 scripts/qemuimage-tests/tools/connman_test.sh |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

Patch

diff --git a/scripts/qemuimage-tests/tools/connman_test.sh b/scripts/qemuimage-tests/tools/connman_test.sh
index d7e63e7..c4a66ee 100644
--- a/scripts/qemuimage-tests/tools/connman_test.sh
+++ b/scripts/qemuimage-tests/tools/connman_test.sh
@@ -27,21 +27,21 @@  if [ ! -f /usr/sbin/connmand ]; then
 fi
 
 # Check if connmand is running in background
-count=`ps -eo cmd | cut -d " " -f 1 | grep -c connmand`
+count=`ps -eo comm | cut -d " " -f 1 | grep -c connmand`
 
 if [ $count -ne 1 ]; then
 	Target_Info "connmand has issue when running in background, Pls, check the output of ps"
-	ps -ef cmd | grep connmand
+	ps -ef | grep connmand
 	exit 1
 fi
 
 # Check if there is always only one connmand running in background
 if [ connmand > /dev/null 2>&1 ]; then
 	Target_Info "connmand command run without problem"
-	count=`ps -eo cmd | cut -d " " -f 1 | grep -c connmand`
+	count=`ps -eo comm | cut -d " " -f 1 | grep -c connmand`
 	if [ $count -ne 1 ]; then
 		Target_Info "There are more than one connmand running in background, Pls, check the output of ps"
-		ps -ef cmd | grep connmand
+		ps -ef | grep connmand
 		exit 1
 	else
 		Target_Info "There is always one connmand running in background, test pass"