Merge lp:~cr3/checkbox/package_linux into lp:checkbox
- package_linux
- Merge into trunk
Proposed by
Marc Tardif
Status: | Merged |
---|---|
Approved by: | Brendan Donegan |
Approved revision: | 1754 |
Merged at revision: | 1754 |
Proposed branch: | lp:~cr3/checkbox/package_linux |
Merge into: | lp:checkbox |
Diff against target: |
431 lines (+6/-53) 13 files modified
debian/changelog (+1/-0) jobs/benchmarks.txt.in (+2/-2) jobs/cpu.txt.in (+0/-4) jobs/daemons.txt.in (+0/-1) jobs/disk.txt.in (+0/-4) jobs/memory.txt.in (+0/-1) jobs/miscellanea.txt.in (+0/-2) jobs/networking.txt.in (+1/-2) jobs/panel_reboot.txt.in (+0/-1) jobs/power-management.txt.in (+2/-6) jobs/stress.txt.in (+0/-1) jobs/suspend.txt.in (+0/-14) jobs/usb.txt.in (+0/-15) |
To merge this branch: | bzr merge lp:~cr3/checkbox/package_linux |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Brendan Donegan (community) | Approve | ||
Review via email: mp+128739@code.launchpad.net |
Commit message
Merged removal of package.name == 'linux' from jobs.
Description of the change
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'debian/changelog' | |||
2 | --- debian/changelog 2012-10-09 13:40:50 +0000 | |||
3 | +++ debian/changelog 2012-10-09 15:26:23 +0000 | |||
4 | @@ -102,6 +102,7 @@ | |||
5 | 102 | dvd write tests (LP: #1057762) | 102 | dvd write tests (LP: #1057762) |
6 | 103 | * [FEATURE] jobs/touchpad.txt.in, jobs/touchscreen.txt.in: Added singletouch | 103 | * [FEATURE] jobs/touchpad.txt.in, jobs/touchscreen.txt.in: Added singletouch |
7 | 104 | and multitouch for touchpads and touchscreens. | 104 | and multitouch for touchpads and touchscreens. |
8 | 105 | * Removed package.name == 'linux' only needed by the apport_prompt plugin. | ||
9 | 105 | 106 | ||
10 | 106 | [Sean Feole] | 107 | [Sean Feole] |
11 | 107 | * [FEATURE] scripts/battery_test: measures battery capacity before and after | 108 | * [FEATURE] scripts/battery_test: measures battery capacity before and after |
12 | 108 | 109 | ||
13 | === modified file 'jobs/benchmarks.txt.in' | |||
14 | --- jobs/benchmarks.txt.in 2012-08-08 11:30:42 +0000 | |||
15 | +++ jobs/benchmarks.txt.in 2012-10-09 15:26:23 +0000 | |||
16 | @@ -6,7 +6,7 @@ | |||
17 | 6 | cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=DISK"' | 6 | cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=DISK"' |
18 | 7 | plugin: shell | 7 | plugin: shell |
19 | 8 | name: benchmarks/disk/hdparm-read_`ls /sys$path/block` | 8 | name: benchmarks/disk/hdparm-read_`ls /sys$path/block` |
21 | 9 | requires: device.path == "$path" and package.name == 'linux' | 9 | requires: device.path == "$path" |
22 | 10 | user: root | 10 | user: root |
23 | 11 | command: hdparm -t /dev/`ls /sys$path/block | sed 's|!|/|'` | sed -e :a -e '$!N;s/\n/ /;ta' | sed 's/.*= *//' | 11 | command: hdparm -t /dev/`ls /sys$path/block | sed 's|!|/|'` | sed -e :a -e '$!N;s/\n/ /;ta' | sed 's/.*= *//' |
24 | 12 | description: This test runs hdparm timing of device reads as a benchmark for $path | 12 | description: This test runs hdparm timing of device reads as a benchmark for $path |
25 | @@ -20,7 +20,7 @@ | |||
26 | 20 | cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=DISK"' | 20 | cat <<'EOF' | run_templates -t -s 'udev_resource | filter_templates -w "category=DISK"' |
27 | 21 | plugin: shell | 21 | plugin: shell |
28 | 22 | name: benchmarks/disk/hdparm-cache-read_`ls /sys$path/block` | 22 | name: benchmarks/disk/hdparm-cache-read_`ls /sys$path/block` |
30 | 23 | requires: device.path == "$path" and package.name == 'linux' | 23 | requires: device.path == "$path" |
31 | 24 | user: root | 24 | user: root |
32 | 25 | command: hdparm -T /dev/`ls /sys$path/block | sed 's|!|/|'` | sed -e :a -e '$!N;s/\n/ /;ta' | sed 's/.*= *//' | 25 | command: hdparm -T /dev/`ls /sys$path/block | sed 's|!|/|'` | sed -e :a -e '$!N;s/\n/ /;ta' | sed 's/.*= *//' |
33 | 26 | description: This test runs hdparm timing of cache reads as a benchmark for $path | 26 | description: This test runs hdparm timing of cache reads as a benchmark for $path |
34 | 27 | 27 | ||
35 | === modified file 'jobs/cpu.txt.in' | |||
36 | --- jobs/cpu.txt.in 2012-09-12 12:58:35 +0000 | |||
37 | +++ jobs/cpu.txt.in 2012-10-09 15:26:23 +0000 | |||
38 | @@ -1,7 +1,6 @@ | |||
39 | 1 | plugin: shell | 1 | plugin: shell |
40 | 2 | name: cpu/scaling_test | 2 | name: cpu/scaling_test |
41 | 3 | requires: | 3 | requires: |
42 | 4 | package.name == 'linux' | ||
43 | 5 | package.name == 'fwts' | 4 | package.name == 'fwts' |
44 | 6 | user: root | 5 | user: root |
45 | 7 | environ: CHECKBOX_DATA | 6 | environ: CHECKBOX_DATA |
46 | @@ -18,14 +17,12 @@ | |||
47 | 18 | 17 | ||
48 | 19 | plugin: shell | 18 | plugin: shell |
49 | 20 | name: cpu/clocktest | 19 | name: cpu/clocktest |
50 | 21 | requires: package.name == 'linux' | ||
51 | 22 | command: clocktest | 20 | command: clocktest |
52 | 23 | _description: | 21 | _description: |
53 | 24 | Test for clock jitter. | 22 | Test for clock jitter. |
54 | 25 | 23 | ||
55 | 26 | plugin: shell | 24 | plugin: shell |
56 | 27 | name: cpu/offlining_test | 25 | name: cpu/offlining_test |
57 | 28 | requires: package.name == 'linux' | ||
58 | 29 | user: root | 26 | user: root |
59 | 30 | command: cpu_offlining | 27 | command: cpu_offlining |
60 | 31 | _description: | 28 | _description: |
61 | @@ -40,7 +37,6 @@ | |||
62 | 40 | 37 | ||
63 | 41 | plugin: shell | 38 | plugin: shell |
64 | 42 | name: cpu/frequency_governors | 39 | name: cpu/frequency_governors |
65 | 43 | requires: package.name == 'linux' | ||
66 | 44 | user: root | 40 | user: root |
67 | 45 | command: nice -n -20 frequency_governors_test --debug | 41 | command: nice -n -20 frequency_governors_test --debug |
68 | 46 | _description: | 42 | _description: |
69 | 47 | 43 | ||
70 | === modified file 'jobs/daemons.txt.in' | |||
71 | --- jobs/daemons.txt.in 2011-10-05 21:01:59 +0000 | |||
72 | +++ jobs/daemons.txt.in 2012-10-09 15:26:23 +0000 | |||
73 | @@ -56,7 +56,6 @@ | |||
74 | 56 | name: daemons/udevd | 56 | name: daemons/udevd |
75 | 57 | requires: | 57 | requires: |
76 | 58 | package.name == 'udevd' | 58 | package.name == 'udevd' |
77 | 59 | package.name == 'linux' | ||
78 | 60 | command: pgrep -f '/sbin/udevd' >/dev/null | 59 | command: pgrep -f '/sbin/udevd' >/dev/null |
79 | 61 | _description: Test if the udevd daemon is running when the package is installed. | 60 | _description: Test if the udevd daemon is running when the package is installed. |
80 | 62 | 61 | ||
81 | 63 | 62 | ||
82 | === modified file 'jobs/disk.txt.in' | |||
83 | --- jobs/disk.txt.in 2012-08-08 20:22:25 +0000 | |||
84 | +++ jobs/disk.txt.in 2012-10-09 15:26:23 +0000 | |||
85 | @@ -14,7 +14,6 @@ | |||
86 | 14 | requires: | 14 | requires: |
87 | 15 | device.path == "$path" | 15 | device.path == "$path" |
88 | 16 | block_device.`ls /sys$path/block`_state != 'removable' | 16 | block_device.`ls /sys$path/block`_state != 'removable' |
89 | 17 | package.name == 'linux' | ||
90 | 18 | user: root | 17 | user: root |
91 | 19 | command: disk_stats_test `ls /sys$path/block | sed 's|!|/|'` | 18 | command: disk_stats_test `ls /sys$path/block | sed 's|!|/|'` |
92 | 20 | description: This test checks disk stats, generates some activity and rechecks stats to verify they've changed. It also verifies that disks appear in the various files they're supposed to. | 19 | description: This test checks disk stats, generates some activity and rechecks stats to verify they've changed. It also verifies that disks appear in the various files they're supposed to. |
93 | @@ -24,7 +23,6 @@ | |||
94 | 24 | name: disk/smart | 23 | name: disk/smart |
95 | 25 | requires: | 24 | requires: |
96 | 26 | package.name == 'smartmontools' | 25 | package.name == 'smartmontools' |
97 | 27 | package.name == 'linux' | ||
98 | 28 | device.category == 'DISK' | 26 | device.category == 'DISK' |
99 | 29 | _description: SMART test | 27 | _description: SMART test |
100 | 30 | command: | 28 | command: |
101 | @@ -69,7 +67,6 @@ | |||
102 | 69 | requires: | 67 | requires: |
103 | 70 | device.path == "$path" | 68 | device.path == "$path" |
104 | 71 | block_device.`ls /sys$path/block`_state != 'removable' | 69 | block_device.`ls /sys$path/block`_state != 'removable' |
105 | 72 | package.name == 'linux' | ||
106 | 73 | description: Disk performance test for $product | 70 | description: Disk performance test for $product |
107 | 74 | user: root | 71 | user: root |
108 | 75 | command: disk_read_performance_test `ls /sys$path/block | sed 's|!|/|'` | 72 | command: disk_read_performance_test `ls /sys$path/block | sed 's|!|/|'` |
109 | @@ -88,7 +85,6 @@ | |||
110 | 88 | requires: | 85 | requires: |
111 | 89 | device.path == "$path" | 86 | device.path == "$path" |
112 | 90 | block_device.`ls /sys$path/block`_state != 'removable' | 87 | block_device.`ls /sys$path/block`_state != 'removable' |
113 | 91 | package.name == 'linux' | ||
114 | 92 | description: Disk I/O stress test for $product | 88 | description: Disk I/O stress test for $product |
115 | 93 | command: storage_test `ls /sys$path/block | sed 's|!|/|'` | 89 | command: storage_test `ls /sys$path/block | sed 's|!|/|'` |
116 | 94 | EOF | 90 | EOF |
117 | 95 | 91 | ||
118 | === modified file 'jobs/memory.txt.in' | |||
119 | --- jobs/memory.txt.in 2012-01-18 15:31:23 +0000 | |||
120 | +++ jobs/memory.txt.in 2012-10-09 15:26:23 +0000 | |||
121 | @@ -8,7 +8,6 @@ | |||
122 | 8 | 8 | ||
123 | 9 | plugin: shell | 9 | plugin: shell |
124 | 10 | name: memory/check | 10 | name: memory/check |
125 | 11 | requires: package.name == 'linux' | ||
126 | 12 | user: root | 11 | user: root |
127 | 13 | command: memory_test | 12 | command: memory_test |
128 | 14 | _description: | 13 | _description: |
129 | 15 | 14 | ||
130 | === modified file 'jobs/miscellanea.txt.in' | |||
131 | --- jobs/miscellanea.txt.in 2012-08-22 14:24:59 +0000 | |||
132 | +++ jobs/miscellanea.txt.in 2012-10-09 15:26:23 +0000 | |||
133 | @@ -15,7 +15,6 @@ | |||
134 | 15 | plugin: manual | 15 | plugin: manual |
135 | 16 | name: miscellanea/chvt | 16 | name: miscellanea/chvt |
136 | 17 | requires: | 17 | requires: |
137 | 18 | package.name == 'linux' | ||
138 | 19 | package.name == 'kbd' | 18 | package.name == 'kbd' |
139 | 20 | user: root | 19 | user: root |
140 | 21 | command: cycle_vts | 20 | command: cycle_vts |
141 | @@ -30,7 +29,6 @@ | |||
142 | 30 | plugin: shell | 29 | plugin: shell |
143 | 31 | name: miscellanea/fwts_test | 30 | name: miscellanea/fwts_test |
144 | 32 | requires: | 31 | requires: |
145 | 33 | package.name == 'linux' | ||
146 | 34 | package.name == 'fwts' | 32 | package.name == 'fwts' |
147 | 35 | user: root | 33 | user: root |
148 | 36 | _description: | 34 | _description: |
149 | 37 | 35 | ||
150 | === modified file 'jobs/networking.txt.in' | |||
151 | --- jobs/networking.txt.in 2012-09-27 09:00:46 +0000 | |||
152 | +++ jobs/networking.txt.in 2012-10-09 15:26:23 +0000 | |||
153 | @@ -21,7 +21,7 @@ | |||
154 | 21 | cat <<'EOF' | run_templates -s 'udev_resource | filter_templates -w "category=NETWORK" | awk "/path: / { print \$2 }" | xargs -n 1 sh -c "for i in \`ls /sys\$0/net 2>/dev/null\`; do echo \$0 \$i; done"' | 21 | cat <<'EOF' | run_templates -s 'udev_resource | filter_templates -w "category=NETWORK" | awk "/path: / { print \$2 }" | xargs -n 1 sh -c "for i in \`ls /sys\$0/net 2>/dev/null\`; do echo \$0 \$i; done"' |
155 | 22 | plugin: manual | 22 | plugin: manual |
156 | 23 | name: networking/info_$2 | 23 | name: networking/info_$2 |
158 | 24 | requires: device.path == "$1" and package.name == 'linux' | 24 | requires: device.path == "$1" |
159 | 25 | command: network_info $2 | 25 | command: network_info $2 |
160 | 26 | _description: | 26 | _description: |
161 | 27 | PURPOSE: | 27 | PURPOSE: |
162 | @@ -114,7 +114,6 @@ | |||
163 | 114 | plugin: shell | 114 | plugin: shell |
164 | 115 | name: networking/multi_nic_$2 | 115 | name: networking/multi_nic_$2 |
165 | 116 | requires: | 116 | requires: |
166 | 117 | package.name == 'linux' | ||
167 | 118 | package.name == 'ethtool' and package.name == 'nmap' | 117 | package.name == 'ethtool' and package.name == 'nmap' |
168 | 119 | device.path == "$1" | 118 | device.path == "$1" |
169 | 120 | user: root | 119 | user: root |
170 | 121 | 120 | ||
171 | === modified file 'jobs/panel_reboot.txt.in' | |||
172 | --- jobs/panel_reboot.txt.in 2011-10-07 18:59:33 +0000 | |||
173 | +++ jobs/panel_reboot.txt.in 2012-10-09 15:26:23 +0000 | |||
174 | @@ -1,6 +1,5 @@ | |||
175 | 1 | plugin: manual | 1 | plugin: manual |
176 | 2 | name: panel_reboot_test | 2 | name: panel_reboot_test |
177 | 3 | requires: package.name == 'linux' | ||
178 | 4 | _description: | 3 | _description: |
179 | 5 | PURPOSE: | 4 | PURPOSE: |
180 | 6 | This test will verify that you can reboot your system from the desktop menu | 5 | This test will verify that you can reboot your system from the desktop menu |
181 | 7 | 6 | ||
182 | === modified file 'jobs/power-management.txt.in' | |||
183 | --- jobs/power-management.txt.in 2012-09-21 16:58:06 +0000 | |||
184 | +++ jobs/power-management.txt.in 2012-10-09 15:26:23 +0000 | |||
185 | @@ -15,7 +15,6 @@ | |||
186 | 15 | user: root | 15 | user: root |
187 | 16 | _description: Test ACPI Wakealarm (fwts wakealarm) | 16 | _description: Test ACPI Wakealarm (fwts wakealarm) |
188 | 17 | requires: | 17 | requires: |
189 | 18 | package.name == 'linux' | ||
190 | 19 | package.name == 'fwts' | 18 | package.name == 'fwts' |
191 | 20 | command: fwts_test -w -l $CHECKBOX_DATA/fwts-wakealarm.log | 19 | command: fwts_test -w -l $CHECKBOX_DATA/fwts-wakealarm.log |
192 | 21 | 20 | ||
193 | @@ -24,7 +23,6 @@ | |||
194 | 24 | depends: power-management/fwts_wakealarm | 23 | depends: power-management/fwts_wakealarm |
195 | 25 | _description: Attach log from fwts wakealarm test | 24 | _description: Attach log from fwts wakealarm test |
196 | 26 | requires: | 25 | requires: |
197 | 27 | package.name == 'linux' | ||
198 | 28 | package.name == 'fwts' | 26 | package.name == 'fwts' |
199 | 29 | command: [ -e ${CHECKBOX_DATA}/fwts-wakealarm.log ] && cat ${CHECKBOX_DATA}/fwts-wakealarm.log | 27 | command: [ -e ${CHECKBOX_DATA}/fwts-wakealarm.log ] && cat ${CHECKBOX_DATA}/fwts-wakealarm.log |
200 | 30 | 28 | ||
201 | @@ -90,7 +88,7 @@ | |||
202 | 90 | 88 | ||
203 | 91 | plugin: manual | 89 | plugin: manual |
204 | 92 | name: power-management/lid_close | 90 | name: power-management/lid_close |
206 | 93 | requires: device.product == 'Lid Switch' and package.name == 'linux' | 91 | requires: device.product == 'Lid Switch' |
207 | 94 | command: | 92 | command: |
208 | 95 | for i in `seq 20`; do | 93 | for i in `seq 20`; do |
209 | 96 | state=`cat /proc/acpi/button/lid/LID/state | awk '{print $2}'` | 94 | state=`cat /proc/acpi/button/lid/LID/state | awk '{print $2}'` |
210 | @@ -108,7 +106,7 @@ | |||
211 | 108 | 106 | ||
212 | 109 | plugin: manual | 107 | plugin: manual |
213 | 110 | name: power-management/lid_open | 108 | name: power-management/lid_open |
215 | 111 | requires: device.product == 'Lid Switch' and package.name == 'linux' | 109 | requires: device.product == 'Lid Switch' |
216 | 112 | command: | 110 | command: |
217 | 113 | for i in `seq 20`; do | 111 | for i in `seq 20`; do |
218 | 114 | state=`cat /proc/acpi/button/lid/LID/state | awk '{print $2}'` | 112 | state=`cat /proc/acpi/button/lid/LID/state | awk '{print $2}'` |
219 | @@ -128,7 +126,6 @@ | |||
220 | 128 | 126 | ||
221 | 129 | plugin: shell | 127 | plugin: shell |
222 | 130 | name: power-management/rtc | 128 | name: power-management/rtc |
223 | 131 | requires: package.name == 'linux' | ||
224 | 132 | command: | 129 | command: |
225 | 133 | test -e /dev/rtc || ( echo "ERROR: Real Time Clock not found" >&2 && exit 1 ) | 130 | test -e /dev/rtc || ( echo "ERROR: Real Time Clock not found" >&2 && exit 1 ) |
226 | 134 | _description: | 131 | _description: |
227 | @@ -136,7 +133,6 @@ | |||
228 | 136 | 133 | ||
229 | 137 | plugin: shell | 134 | plugin: shell |
230 | 138 | name: power-management/tickless_idle | 135 | name: power-management/tickless_idle |
231 | 139 | requires: package.name == 'linux' | ||
232 | 140 | _description: Check to see if CONFIG_NO_HZ is set in the kernel (this is just a simple regression check) | 136 | _description: Check to see if CONFIG_NO_HZ is set in the kernel (this is just a simple regression check) |
233 | 141 | command: | 137 | command: |
234 | 142 | zgrep 'CONFIG_NO_HZ=y' /boot/config-`uname -r` >/dev/null 2>&1 || ( echo "WARNING: Tickless Idle is NOT set" >&2 && exit 1 ) | 138 | zgrep 'CONFIG_NO_HZ=y' /boot/config-`uname -r` >/dev/null 2>&1 || ( echo "WARNING: Tickless Idle is NOT set" >&2 && exit 1 ) |
235 | 143 | 139 | ||
236 | === modified file 'jobs/stress.txt.in' | |||
237 | --- jobs/stress.txt.in 2012-09-19 16:12:11 +0000 | |||
238 | +++ jobs/stress.txt.in 2012-10-09 15:26:23 +0000 | |||
239 | @@ -1,7 +1,6 @@ | |||
240 | 1 | plugin: shell | 1 | plugin: shell |
241 | 2 | name: stress/cpu_stress_test | 2 | name: stress/cpu_stress_test |
242 | 3 | requires: | 3 | requires: |
243 | 4 | package.name == 'linux' | ||
244 | 5 | package.name == 'stress' | 4 | package.name == 'stress' |
245 | 6 | user: root | 5 | user: root |
246 | 7 | command: stress --cpu `cpuinfo_resource | awk '/count:/ {print $2}'` --vm `awk '/MemTotal/ {num_vm = $2/262144; if (num_vm != int(num_vm)) num_vm = int(num_vm) + 1; print num_vm}' /proc/meminfo` --timeout 7200 | 6 | command: stress --cpu `cpuinfo_resource | awk '/count:/ {print $2}'` --vm `awk '/MemTotal/ {num_vm = $2/262144; if (num_vm != int(num_vm)) num_vm = int(num_vm) + 1; print num_vm}' /proc/meminfo` --timeout 7200 |
247 | 8 | 7 | ||
248 | === modified file 'jobs/suspend.txt.in' | |||
249 | --- jobs/suspend.txt.in 2012-10-04 07:23:21 +0000 | |||
250 | +++ jobs/suspend.txt.in 2012-10-09 15:26:23 +0000 | |||
251 | @@ -19,15 +19,11 @@ | |||
252 | 19 | 19 | ||
253 | 20 | plugin: shell | 20 | plugin: shell |
254 | 21 | name: suspend/cpu_before_suspend | 21 | name: suspend/cpu_before_suspend |
255 | 22 | requires: | ||
256 | 23 | package.name == 'linux' | ||
257 | 24 | _description: Verify that all the CPUs are online before suspending | 22 | _description: Verify that all the CPUs are online before suspending |
258 | 25 | command: cpuinfo_resource > $CHECKBOX_DATA/cpuinfo_before_suspend | 23 | command: cpuinfo_resource > $CHECKBOX_DATA/cpuinfo_before_suspend |
259 | 26 | 24 | ||
260 | 27 | plugin: shell | 25 | plugin: shell |
261 | 28 | name: suspend/memory_before_suspend | 26 | name: suspend/memory_before_suspend |
262 | 29 | requires: | ||
263 | 30 | package.name == 'linux' | ||
264 | 31 | _description: | 27 | _description: |
265 | 32 | Dumps memory info to a file for comparison after suspend test has been run | 28 | Dumps memory info to a file for comparison after suspend test has been run |
266 | 33 | command: meminfo_resource > $CHECKBOX_DATA/meminfo_before_suspend | 29 | command: meminfo_resource > $CHECKBOX_DATA/meminfo_before_suspend |
267 | @@ -191,24 +187,18 @@ | |||
268 | 191 | 187 | ||
269 | 192 | plugin: shell | 188 | plugin: shell |
270 | 193 | name: suspend/cpu_after_suspend | 189 | name: suspend/cpu_after_suspend |
271 | 194 | requires: | ||
272 | 195 | package.name == 'linux' | ||
273 | 196 | depends: suspend/suspend_advanced suspend/cpu_before_suspend | 190 | depends: suspend/suspend_advanced suspend/cpu_before_suspend |
274 | 197 | _description: Verify that all CPUs are online after resuming. | 191 | _description: Verify that all CPUs are online after resuming. |
275 | 198 | command: cpuinfo_resource | diff $CHECKBOX_DATA/cpuinfo_before_suspend - | 192 | command: cpuinfo_resource | diff $CHECKBOX_DATA/cpuinfo_before_suspend - |
276 | 199 | 193 | ||
277 | 200 | plugin: shell | 194 | plugin: shell |
278 | 201 | name: suspend/cpu_after_suspend_auto | 195 | name: suspend/cpu_after_suspend_auto |
279 | 202 | requires: | ||
280 | 203 | package.name == 'linux' | ||
281 | 204 | depends: suspend/suspend_advanced_auto suspend/cpu_before_suspend | 196 | depends: suspend/suspend_advanced_auto suspend/cpu_before_suspend |
282 | 205 | _description: Verify that all CPUs are online after resuming. | 197 | _description: Verify that all CPUs are online after resuming. |
283 | 206 | command: cpuinfo_resource | diff $CHECKBOX_DATA/cpuinfo_before_suspend - | 198 | command: cpuinfo_resource | diff $CHECKBOX_DATA/cpuinfo_before_suspend - |
284 | 207 | 199 | ||
285 | 208 | plugin: shell | 200 | plugin: shell |
286 | 209 | name: suspend/memory_after_suspend | 201 | name: suspend/memory_after_suspend |
287 | 210 | requires: | ||
288 | 211 | package.name == 'linux' | ||
289 | 212 | depends: suspend/suspend_advanced suspend/memory_before_suspend | 202 | depends: suspend/suspend_advanced suspend/memory_before_suspend |
290 | 213 | _description: | 203 | _description: |
291 | 214 | Verify that all memory is available after resuming from suspend. | 204 | Verify that all memory is available after resuming from suspend. |
292 | @@ -216,8 +206,6 @@ | |||
293 | 216 | 206 | ||
294 | 217 | plugin: shell | 207 | plugin: shell |
295 | 218 | name: suspend/memory_after_suspend_auto | 208 | name: suspend/memory_after_suspend_auto |
296 | 219 | requires: | ||
297 | 220 | package.name == 'linux' | ||
298 | 221 | depends: suspend/suspend_advanced_auto suspend/memory_before_suspend | 209 | depends: suspend/suspend_advanced_auto suspend/memory_before_suspend |
299 | 222 | _description: | 210 | _description: |
300 | 223 | Verify that all memory is available after resuming from suspend. | 211 | Verify that all memory is available after resuming from suspend. |
301 | @@ -225,8 +213,6 @@ | |||
302 | 225 | 213 | ||
303 | 226 | plugin: manual | 214 | plugin: manual |
304 | 227 | name: suspend/display_after_suspend | 215 | name: suspend/display_after_suspend |
305 | 228 | requires: | ||
306 | 229 | package.name == 'linux' | ||
307 | 230 | depends: suspend/suspend_advanced | 216 | depends: suspend/suspend_advanced |
308 | 231 | _description: | 217 | _description: |
309 | 232 | PURPOSE: | 218 | PURPOSE: |
310 | 233 | 219 | ||
311 | === modified file 'jobs/usb.txt.in' | |||
312 | --- jobs/usb.txt.in 2012-10-01 14:25:12 +0000 | |||
313 | +++ jobs/usb.txt.in 2012-10-09 15:26:23 +0000 | |||
314 | @@ -1,13 +1,11 @@ | |||
315 | 1 | plugin: shell | 1 | plugin: shell |
316 | 2 | name: usb/detect | 2 | name: usb/detect |
317 | 3 | requires: package.name == 'linux' | ||
318 | 4 | command: lsusb | sed 's/.*\(ID .*\)/\1/' | head -n 4 || echo "No USB devices were detected" >&2 | 3 | command: lsusb | sed 's/.*\(ID .*\)/\1/' | head -n 4 || echo "No USB devices were detected" >&2 |
319 | 5 | _description: Detects and shows USB devices attached to this system. | 4 | _description: Detects and shows USB devices attached to this system. |
320 | 6 | 5 | ||
321 | 7 | plugin: manual | 6 | plugin: manual |
322 | 8 | name: usb/disk_detect | 7 | name: usb/disk_detect |
323 | 9 | depends: usb/detect | 8 | depends: usb/detect |
324 | 10 | requires: package.name == 'linux' | ||
325 | 11 | command: removable_storage_test -l usb | 9 | command: removable_storage_test -l usb |
326 | 12 | _description: | 10 | _description: |
327 | 13 | PURPOSE: | 11 | PURPOSE: |
328 | @@ -23,7 +21,6 @@ | |||
329 | 23 | plugin: manual | 21 | plugin: manual |
330 | 24 | name: usb/HID | 22 | name: usb/HID |
331 | 25 | depends: usb/detect | 23 | depends: usb/detect |
332 | 26 | requires: package.name == 'linux' | ||
333 | 27 | command: keyboard_test | 24 | command: keyboard_test |
334 | 28 | _description: | 25 | _description: |
335 | 29 | PURPOSE: | 26 | PURPOSE: |
336 | @@ -38,7 +35,6 @@ | |||
337 | 38 | plugin: manual | 35 | plugin: manual |
338 | 39 | name: usb/insert | 36 | name: usb/insert |
339 | 40 | depends: usb/detect | 37 | depends: usb/detect |
340 | 41 | requires: package.name == 'linux' | ||
341 | 42 | command: removable_storage_watcher insert usb | 38 | command: removable_storage_watcher insert usb |
342 | 43 | _description: | 39 | _description: |
343 | 44 | PURPOSE: | 40 | PURPOSE: |
344 | @@ -55,7 +51,6 @@ | |||
345 | 55 | plugin: manual | 51 | plugin: manual |
346 | 56 | name: usb3/insert | 52 | name: usb3/insert |
347 | 57 | requires: | 53 | requires: |
348 | 58 | package.name == 'linux' | ||
349 | 59 | usb.usb3 == 'supported' | 54 | usb.usb3 == 'supported' |
350 | 60 | command: removable_storage_watcher -m 500000000 insert usb | 55 | command: removable_storage_watcher -m 500000000 insert usb |
351 | 61 | _description: | 56 | _description: |
352 | @@ -73,7 +68,6 @@ | |||
353 | 73 | plugin: manual | 68 | plugin: manual |
354 | 74 | name: usb/remove | 69 | name: usb/remove |
355 | 75 | depends: usb/insert | 70 | depends: usb/insert |
356 | 76 | requires: package.name == 'linux' | ||
357 | 77 | command: removable_storage_watcher remove usb | 71 | command: removable_storage_watcher remove usb |
358 | 78 | _description: | 72 | _description: |
359 | 79 | PURPOSE: | 73 | PURPOSE: |
360 | @@ -90,7 +84,6 @@ | |||
361 | 90 | name: usb3/remove | 84 | name: usb3/remove |
362 | 91 | depends: usb3/insert | 85 | depends: usb3/insert |
363 | 92 | requires: | 86 | requires: |
364 | 93 | package.name == 'linux' | ||
365 | 94 | usb.usb3 == 'supported' | 87 | usb.usb3 == 'supported' |
366 | 95 | command: removable_storage_watcher -m 500000000 remove usb | 88 | command: removable_storage_watcher -m 500000000 remove usb |
367 | 96 | _description: | 89 | _description: |
368 | @@ -106,7 +99,6 @@ | |||
369 | 106 | 99 | ||
370 | 107 | plugin: manual | 100 | plugin: manual |
371 | 108 | name: usb/storage-transfer | 101 | name: usb/storage-transfer |
372 | 109 | requires: package.name == 'linux' | ||
373 | 110 | depends: usb/insert | 102 | depends: usb/insert |
374 | 111 | command: removable_storage_test usb | 103 | command: removable_storage_test usb |
375 | 112 | _description: | 104 | _description: |
376 | @@ -123,7 +115,6 @@ | |||
377 | 123 | plugin: manual | 115 | plugin: manual |
378 | 124 | name: usb3/storage-transfer | 116 | name: usb3/storage-transfer |
379 | 125 | requires: | 117 | requires: |
380 | 126 | package.name == 'linux' | ||
381 | 127 | usb.usb3 == 'supported' | 118 | usb.usb3 == 'supported' |
382 | 128 | depends: usb3/insert | 119 | depends: usb3/insert |
383 | 129 | command: removable_storage_test -m 500000000 -p 7 usb | 120 | command: removable_storage_test -m 500000000 -p 7 usb |
384 | @@ -141,7 +132,6 @@ | |||
385 | 141 | plugin: shell | 132 | plugin: shell |
386 | 142 | name: usb/storage-automated | 133 | name: usb/storage-automated |
387 | 143 | depends: usb/insert | 134 | depends: usb/insert |
388 | 144 | requires: package.name == 'linux' | ||
389 | 145 | command: removable_storage_test usb | 135 | command: removable_storage_test usb |
390 | 146 | _description: | 136 | _description: |
391 | 147 | This test is automated and executes after the usb/insert test is run. | 137 | This test is automated and executes after the usb/insert test is run. |
392 | @@ -149,7 +139,6 @@ | |||
393 | 149 | plugin: shell | 139 | plugin: shell |
394 | 150 | name: usb3/storage-automated | 140 | name: usb3/storage-automated |
395 | 151 | requires: | 141 | requires: |
396 | 152 | package.name == 'linux' | ||
397 | 153 | usb.usb3 == 'supported' | 142 | usb.usb3 == 'supported' |
398 | 154 | depends: usb3/insert | 143 | depends: usb3/insert |
399 | 155 | command: removable_storage_test -m 500000000 -p 7 usb | 144 | command: removable_storage_test -m 500000000 -p 7 usb |
400 | @@ -159,7 +148,6 @@ | |||
401 | 159 | plugin: shell | 148 | plugin: shell |
402 | 160 | name: usb/storage-preinserted | 149 | name: usb/storage-preinserted |
403 | 161 | user: root | 150 | user: root |
404 | 162 | requires: package.name == 'linux' | ||
405 | 163 | command: removable_storage_test -l usb && removable_storage_test usb | 151 | command: removable_storage_test -l usb && removable_storage_test usb |
406 | 164 | _description: | 152 | _description: |
407 | 165 | This is an automated version of usb/storage-automated and assumes that the | 153 | This is an automated version of usb/storage-automated and assumes that the |
408 | @@ -170,7 +158,6 @@ | |||
409 | 170 | name: usb3/storage-preinserted | 158 | name: usb3/storage-preinserted |
410 | 171 | user: root | 159 | user: root |
411 | 172 | requires: | 160 | requires: |
412 | 173 | package.name == 'linux' | ||
413 | 174 | usb.usb3 == 'supported' | 161 | usb.usb3 == 'supported' |
414 | 175 | command: removable_storage_test -l usb && removable_storage_test -m 500000000 -p 7 usb | 162 | command: removable_storage_test -l usb && removable_storage_test -m 500000000 -p 7 usb |
415 | 176 | _description: | 163 | _description: |
416 | @@ -180,7 +167,6 @@ | |||
417 | 180 | 167 | ||
418 | 181 | plugin: manual | 168 | plugin: manual |
419 | 182 | name: usb/panels | 169 | name: usb/panels |
420 | 183 | requires: package.name == 'linux' | ||
421 | 184 | _description: | 170 | _description: |
422 | 185 | PURPOSE: | 171 | PURPOSE: |
423 | 186 | This test will check your USB connection. | 172 | This test will check your USB connection. |
424 | @@ -205,7 +191,6 @@ | |||
425 | 205 | requires: | 191 | requires: |
426 | 206 | device.path == "$path" | 192 | device.path == "$path" |
427 | 207 | block_device.`ls /sys$path/block`_state == 'removable' and block_device.`ls /sys$path/block`_usb3 == 'supported' | 193 | block_device.`ls /sys$path/block`_state == 'removable' and block_device.`ls /sys$path/block`_usb3 == 'supported' |
428 | 208 | package.name == 'linux' | ||
429 | 209 | description: USB3 read performance test for $product | 194 | description: USB3 read performance test for $product |
430 | 210 | user: root | 195 | user: root |
431 | 211 | command: disk_read_performance_test `ls /sys$path/block | sed 's|!|/|'` | 196 | command: disk_read_performance_test `ls /sys$path/block | sed 's|!|/|'` |
At last! Hopefully they've all been caught!