Merge lp:~liuyq0307/lava-android-test/pm-qa-indefinite-loop into lp:lava-android-test

[Yongqin Liu]

some changes on the pm-qa test:
1. make it can accept the scripts dir as an option
2. fix the pm-qa.sh script for the definite loop problem
3. fix the test case id according to the pattern of the test definition

[Yongqin Liu (liuyq0307)]

review: Approve (self test)

=== modified file 'lava_android_test/test_definitions/pm_qa.py'
--- lava_android_test/test_definitions/pm_qa.py	2013-05-16 09:05:03 +0000
+++ lava_android_test/test_definitions/pm_qa.py	2013-06-05 08:07:51 +0000
@@ -23,13 +23,14 @@
 
 **URL:** https://git.linaro.org/gitweb?p=tools/pm-qa.git;a=summary
 
-**Default options:** None
+**Default options:** /data/benchmark/pm-qa
 """
 
 import os
 import lava_android_test.testdef
 from lava_android_test.config import get_config
 
+DEFAULT_OPTIONS = '/data/benchmark/pm-qa'
 test_name = 'pm_qa'
 config = get_config()
 curdir = os.path.realpath(os.path.dirname(__file__))
@@ -42,7 +43,7 @@
                                           test_sh_android_path),
                           'shell chmod 777 %s' % test_sh_android_path]
 
-ADB_SHELL_STEPS = [test_sh_android_path]
+ADB_SHELL_STEPS = ["%s $(OPTIONS)" % test_sh_android_path]
 PATTERN = "^\s*(?P<test_case_id>\w+)=(?P<result>\w+)\s*$"
 
 inst = lava_android_test.testdef.AndroidTestInstaller(
@@ -53,4 +54,5 @@
 testobj = lava_android_test.testdef.AndroidTest(testname=test_name,
                                     installer=inst,
                                     runner=run,
-                                    parser=parser)
+                                    parser=parser,
+                                    default_options=DEFAULT_OPTIONS)

=== modified file 'lava_android_test/test_definitions/pm_qa/pm-qa.sh'
--- lava_android_test/test_definitions/pm_qa/pm-qa.sh	2013-05-30 08:42:45 +0000
+++ lava_android_test/test_definitions/pm_qa/pm-qa.sh	2013-06-05 08:07:51 +0000
@@ -1,10 +1,14 @@
 #!/system/bin/sh
 
+scripts_dir=$1 && shift
+if [ -z "${scripts_dir}" ];then
+    scripts_dir="/data/benchmark/pm-qa"
+fi
 test_func(){
-   if [ ! -d /data/benchmark/pm-qa ]; then
-       echo "pm-qa=fail"
+   if [ ! -d "${scripts_dir}" ]; then
+       echo "pm_qa=fail"
        exit
-   fi  
+   fi
 
    mkdir /data/bin/
    cd /data/bin
@@ -30,31 +34,30 @@
 
    export PATH=/data/bin:$PATH
 
-   cd /data/benchmark/pm-qa
+   cd "${scripts_dir}"
 
-   pwd=$PWD
+   pwd_dir=$PWD
    echo $pwd
    tests_dirs="cpuidle cpufreq cpuhotplug sched_mc suspend thermal utils"
-   files=`find cpuidle cpufreq cpuhotplug sched_mc suspend -name "*.sh"`
 
-   for dir in $tests_dirs
-   do
-       subDir=`pwd`/$dir
+   for dir in $tests_dirs; do
+       subDir=${pwd_dir}/$dir
        if [ -d $subDir ]; then
-       cd $subDir
+           cd $subDir
+       else
+           continue
        fi
 
        echo `pwd`
-       for file in `find . -name "*.sh"`
-       do
-       path=$file
-       echo $path
-       /system/bin/sh $path
+       for file in `find . -name "*.sh"`; do
+           path=$file
+           echo $path
+           /system/bin/sh $path
        done
        cd ..
    done
 
-   echo "pm-qa=pass"
+   echo "pm_qa=pass"
 }
 
 test_func