diff options
| author | Jiajun Xu <jiajun.xu@intel.com> | 2011-11-17 14:05:49 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-18 10:46:27 +0000 |
| commit | dd856f5609c13fc740b53016de033a8a9cbe6b51 (patch) | |
| tree | 665183fff45f4e3a01890975763bf904f0907911 /scripts | |
| parent | b2ef543284c8c8d0d3badb2e1bcadad1106982d2 (diff) | |
| download | openembedded-core-dd856f5609c13fc740b53016de033a8a9cbe6b51.tar.gz openembedded-core-dd856f5609c13fc740b53016de033a8a9cbe6b51.tar.bz2 openembedded-core-dd856f5609c13fc740b53016de033a8a9cbe6b51.tar.xz openembedded-core-dd856f5609c13fc740b53016de033a8a9cbe6b51.zip | |
sanitytest: use different option for command ps from busybox and procps
Current sanitytest use option -e for ps command, which only works for ps
from procps. It fails if ps is provided by busybox. Add check to use different
option for command from busybox and procps.
[YOCTO #1756]
Signed-off-by: Jiajun Xu <jiajun.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/qemuimage-tests/tools/connman_test.sh | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/scripts/qemuimage-tests/tools/connman_test.sh b/scripts/qemuimage-tests/tools/connman_test.sh index c4a66eebe..8ed8b8b4a 100644 --- a/scripts/qemuimage-tests/tools/connman_test.sh +++ b/scripts/qemuimage-tests/tools/connman_test.sh @@ -20,6 +20,16 @@ Target_Err() echo -e "\tTARGET: ##### End #####" } +# Check if ps comes from Procps or busybox first +ls -l `which ps` | grep -q "busybox" +RET=$? + +if [ $RET -eq 0 ]; then + PS="ps" +else + PS="ps -ef" +fi + # Check if connmand is in target if [ ! -f /usr/sbin/connmand ]; then Target_Info "No connmand command found" @@ -27,21 +37,31 @@ if [ ! -f /usr/sbin/connmand ]; then fi # Check if connmand is running in background -count=`ps -eo comm | cut -d " " -f 1 | grep -c connmand` +if [ $RET -eq 0 ]; then + count=`ps | awk '{print $5}' | grep -c connmand` +else + count=`ps -eo comm | cut -d " " -f 1 | grep -c connmand` +fi if [ $count -ne 1 ]; then Target_Info "connmand has issue when running in background, Pls, check the output of ps" - ps -ef | grep connmand + ${PS} | 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 comm | cut -d " " -f 1 | grep -c connmand` + + if [ $RET -eq 0 ]; then + count=`ps | awk '{print $5}' | grep -c connmand` + else + count=`ps -eo comm | cut -d " " -f 1 | grep -c connmand` + fi + if [ $count -ne 1 ]; then Target_Info "There are more than one connmand running in background, Pls, check the output of ps" - ps -ef | grep connmand + ${PS} | grep connmand exit 1 else Target_Info "There is always one connmand running in background, test pass" |