summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorTom Rini <tom_rini@mentor.com>2011-07-27 15:01:35 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-04 15:04:34 +0100
commit10304e08adf0f6e426256ec99c5a7ffbcd52e115 (patch)
tree52f91c106965b3dd21d4eb6849570973da5bfc8e /scripts
parent5d87fb8b7bda7da3b77e0c99425efc3525654426 (diff)
downloadast2050-yocto-poky-10304e08adf0f6e426256ec99c5a7ffbcd52e115.zip
ast2050-yocto-poky-10304e08adf0f6e426256ec99c5a7ffbcd52e115.tar.gz
connman_test.sh: Rework for busybox 'ps'
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. (From OE-Core rev: cb34ce6833f298d487eeb35cf8297f286ef624d4) Signed-off-by: Tom Rini <tom_rini@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/qemuimage-tests/tools/connman_test.sh8
1 files changed, 4 insertions, 4 deletions
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"
OpenPOWER on IntegriCloud