Merge lp:~liuyq0307/lava-android-test/change-name-of-pm-qa into lp:lava-android-test

Proposed by Yongqin Liu
Status: Merged
Merged at revision: 253
Proposed branch: lp:~liuyq0307/lava-android-test/change-name-of-pm-qa
Merge into: lp:lava-android-test
Diff against target: 144 lines (+61/-61)
3 files modified
MANIFEST.in (+1/-1)
lava_android_test/test_definitions/pm-qa/pm-qa.sh (+0/-60)
lava_android_test/test_definitions/pm_qa/pm-qa.sh (+60/-0)
To merge this branch: bzr merge lp:~liuyq0307/lava-android-test/change-name-of-pm-qa
Reviewer Review Type Date Requested Status
Yongqin Liu self test Approve
Review via email: mp+166458@code.launchpad.net

Description of the change

Fix the installation error of pm_qa in this job:
https://validation.linaro.org/lava-server/scheduler/job/56096/log_file

To post a comment you must log in.
Revision history for this message
Yongqin Liu (liuyq0307) :
review: Approve (self test)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'MANIFEST.in'
2--- MANIFEST.in 2012-08-04 10:47:52 +0000
3+++ MANIFEST.in 2013-05-30 08:48:26 +0000
4@@ -10,7 +10,7 @@
5 include lava_android_test/test_definitions/gatortest/*
6 include lava_android_test/test_definitions/usbhardware/*
7 include lava_android_test/test_definitions/ime/*
8-include lava_android_test/test_definitions/pm-qa/*
9+include lava_android_test/test_definitions/pm_qa/*
10 include lava_android_test/test_definitions/shells/*
11 include lava_android_test/test_definitions/hostshells/*
12 include lava_android_test/test_definitions/methanol/*
13
14=== removed directory 'lava_android_test/test_definitions/pm-qa'
15=== removed file 'lava_android_test/test_definitions/pm-qa/pm-qa.sh'
16--- lava_android_test/test_definitions/pm-qa/pm-qa.sh 2013-04-17 03:38:27 +0000
17+++ lava_android_test/test_definitions/pm-qa/pm-qa.sh 1970-01-01 00:00:00 +0000
18@@ -1,60 +0,0 @@
19-#!/system/bin/sh
20-
21-test_func(){
22- if [ ! -d /data/benchmark/pm-qa ]; then
23- echo "pm-qa=fail"
24- exit
25- fi
26-
27- mkdir /data/bin/
28- cd /data/bin
29-
30- busybox ln -s -f /system/bin/busybox awk
31- busybox ln -s -f /system/bin/busybox basename
32- busybox ln -s -f /system/bin/busybox chmod
33- busybox ln -s -f /system/bin/busybox chown
34- busybox ln -s -f /system/bin/busybox cp
35- busybox ln -s -f /system/bin/busybox diff
36- busybox ln -s -f /system/bin/busybox find
37- busybox ln -s -f /system/bin/busybox grep
38- busybox ln -s -f /system/bin/busybox rm
39- busybox ln -s -f /system/bin/busybox seq
40- busybox ln -s -f /system/bin/busybox taskset
41- busybox ln -s -f /system/bin/busybox tee
42- busybox ln -s -f /system/bin/busybox printf
43- busybox ln -s -f /system/bin/busybox wc
44-
45- busybox ln -s -f /system/bin/fake_command command
46- busybox ln -s -f /system/bin/fake_sudo sudo
47- busybox ln -s -f /system/bin/fake_udevadm udevadm
48-
49- export PATH=/data/bin:$PATH
50-
51- cd /data/benchmark/pm-qa
52-
53- pwd=$PWD
54- echo $pwd
55- tests_dirs="cpuidle cpufreq cpuhotplug sched_mc suspend thermal utils"
56- files=`find cpuidle cpufreq cpuhotplug sched_mc suspend -name "*.sh"`
57-
58- for dir in $tests_dirs
59- do
60- subDir=`pwd`/$dir
61- if [ -d $subDir ]; then
62- cd $subDir
63- fi
64-
65- echo `pwd`
66- for file in `find . -name "*.sh"`
67- do
68- path=$file
69- echo $path
70- /system/bin/sh $path
71- done
72- cd ..
73- done
74-
75- echo "pm-qa=pass"
76-}
77-
78-test_func
79
80=== added directory 'lava_android_test/test_definitions/pm_qa'
81=== added file 'lava_android_test/test_definitions/pm_qa/pm-qa.sh'
82--- lava_android_test/test_definitions/pm_qa/pm-qa.sh 1970-01-01 00:00:00 +0000
83+++ lava_android_test/test_definitions/pm_qa/pm-qa.sh 2013-05-30 08:48:26 +0000
84@@ -0,0 +1,60 @@
85+#!/system/bin/sh
86+
87+test_func(){
88+ if [ ! -d /data/benchmark/pm-qa ]; then
89+ echo "pm-qa=fail"
90+ exit
91+ fi
92+
93+ mkdir /data/bin/
94+ cd /data/bin
95+
96+ busybox ln -s -f /system/bin/busybox awk
97+ busybox ln -s -f /system/bin/busybox basename
98+ busybox ln -s -f /system/bin/busybox chmod
99+ busybox ln -s -f /system/bin/busybox chown
100+ busybox ln -s -f /system/bin/busybox cp
101+ busybox ln -s -f /system/bin/busybox diff
102+ busybox ln -s -f /system/bin/busybox find
103+ busybox ln -s -f /system/bin/busybox grep
104+ busybox ln -s -f /system/bin/busybox rm
105+ busybox ln -s -f /system/bin/busybox seq
106+ busybox ln -s -f /system/bin/busybox taskset
107+ busybox ln -s -f /system/bin/busybox tee
108+ busybox ln -s -f /system/bin/busybox printf
109+ busybox ln -s -f /system/bin/busybox wc
110+
111+ busybox ln -s -f /system/bin/fake_command command
112+ busybox ln -s -f /system/bin/fake_sudo sudo
113+ busybox ln -s -f /system/bin/fake_udevadm udevadm
114+
115+ export PATH=/data/bin:$PATH
116+
117+ cd /data/benchmark/pm-qa
118+
119+ pwd=$PWD
120+ echo $pwd
121+ tests_dirs="cpuidle cpufreq cpuhotplug sched_mc suspend thermal utils"
122+ files=`find cpuidle cpufreq cpuhotplug sched_mc suspend -name "*.sh"`
123+
124+ for dir in $tests_dirs
125+ do
126+ subDir=`pwd`/$dir
127+ if [ -d $subDir ]; then
128+ cd $subDir
129+ fi
130+
131+ echo `pwd`
132+ for file in `find . -name "*.sh"`
133+ do
134+ path=$file
135+ echo $path
136+ /system/bin/sh $path
137+ done
138+ cd ..
139+ done
140+
141+ echo "pm-qa=pass"
142+}
143+
144+test_func

Subscribers

People subscribed via source and target branches