summaryrefslogtreecommitdiffstats
path: root/scripts/qemuimage-tests
diff options
context:
space:
mode:
authorTom Rini <tom_rini@mentor.com>2011-07-27 22:01:35 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-04 14:04:34 (GMT)
commit10304e08adf0f6e426256ec99c5a7ffbcd52e115 (patch)
tree52f91c106965b3dd21d4eb6849570973da5bfc8e /scripts/qemuimage-tests
parent5d87fb8b7bda7da3b77e0c99425efc3525654426 (diff)
downloadpoky-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/qemuimage-tests')
-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
27fi 27fi
28 28
29# Check if connmand is running in background 29# Check if connmand is running in background
30count=`ps -eo cmd | cut -d " " -f 1 | grep -c connmand` 30count=`ps -eo comm | cut -d " " -f 1 | grep -c connmand`
31 31
32if [ $count -ne 1 ]; then 32if [ $count -ne 1 ]; then
33 Target_Info "connmand has issue when running in background, Pls, check the output of ps" 33 Target_Info "connmand has issue when running in background, Pls, check the output of ps"
34 ps -ef cmd | grep connmand 34 ps -ef | grep connmand
35 exit 1 35 exit 1
36fi 36fi
37 37
38# Check if there is always only one connmand running in background 38# Check if there is always only one connmand running in background
39if [ connmand > /dev/null 2>&1 ]; then 39if [ connmand > /dev/null 2>&1 ]; then
40 Target_Info "connmand command run without problem" 40 Target_Info "connmand command run without problem"
41 count=`ps -eo cmd | cut -d " " -f 1 | grep -c connmand` 41 count=`ps -eo comm | cut -d " " -f 1 | grep -c connmand`
42 if [ $count -ne 1 ]; then 42 if [ $count -ne 1 ]; then
43 Target_Info "There are more than one connmand running in background, Pls, check the output of ps" 43 Target_Info "There are more than one connmand running in background, Pls, check the output of ps"
44 ps -ef cmd | grep connmand 44 ps -ef | grep connmand
45 exit 1 45 exit 1
46 else 46 else
47 Target_Info "There is always one connmand running in background, test pass" 47 Target_Info "There is always one connmand running in background, test pass"