Merge branch 'master' of ssh://git.linaro.org/qa/test-definitions2015.02

1 files changed, 8 insertions, 22 deletions

diff --git a/common/scripts/pm-qa.sh b/common/scripts/pm-qa.sh
index 2bec7ae..ed96a87 100755
--- a/common/scripts/pm-qa.sh
+++ b/common/scripts/pm-qa.sh
@@ -7,35 +7,21 @@ test_func(){
        exit
    fi
 
-   mkdir /data/bin/
-   cd /data/bin
+   bin_dir="/data/bin"
 
-   busybox ln -s -f /system/bin/busybox awk
-   busybox ln -s -f /system/bin/busybox basename
-   busybox ln -s -f /system/bin/busybox chmod
-   busybox ln -s -f /system/bin/busybox chown
-   busybox ln -s -f /system/bin/busybox cp
-   busybox ln -s -f /system/bin/busybox diff
-   busybox ln -s -f /system/bin/busybox find
-   busybox ln -s -f /system/bin/busybox grep
-   busybox ln -s -f /system/bin/busybox rm
-   busybox ln -s -f /system/bin/busybox seq
-   busybox ln -s -f /system/bin/busybox taskset
-   busybox ln -s -f /system/bin/busybox tee
-   busybox ln -s -f /system/bin/busybox printf
-   busybox ln -s -f /system/bin/busybox wc
+   if [ ! -d $bin_dir ]; then
+        mkdir $bin_dir
+   fi
 
-   busybox ln -s -f /system/bin/fake_command command
-   busybox ln -s -f /system/bin/fake_sudo sudo
-   busybox ln -s -f /system/bin/fake_udevadm udevadm
+   cd ${bin_dir}
 
-   export PATH=/data/bin:$PATH
+   export PATH=${bin_dir}:$PATH
 
    cd "${scripts_dir}"
 
    pwd_dir=$PWD
    echo $pwd
-   tests_dirs="cpuidle cpufreq cpuhotplug suspend thermal"
+   tests_dirs="cpuidle cpufreq cpuhotplug cputopology thermal"
 
    for dir in $tests_dirs; do
        var=$dir'_sanity.sh'
@@ -53,7 +39,7 @@ test_func(){
            continue
        fi
 
-       for file in `find . -name "*.sh"`; do
+       for file in `find . -name "*.sh" | sort`; do
            path=$file
            echo $path
            /system/bin/sh $path