Merge ~jocave/plainbox-provider-checkbox:non-syslog-armvfp into plainbox-provider-checkbox:master

Proposed by Jonathan Cave
Status: Merged
Approved by: Jonathan Cave
Approved revision: 9508299b25a90eb556fb4fcef6c878a2fb968e44
Merged at revision: 632b00a490a6cedb4f7bddb17482354064bc5b6f
Proposed branch: ~jocave/plainbox-provider-checkbox:non-syslog-armvfp
Merge into: plainbox-provider-checkbox:master
Diff against target: 48 lines (+25/-6)
1 file modified
units/cpu/jobs.pxu (+25/-6)
Reviewer Review Type Date Requested Status
Sylvain Pineau (community) Approve
Paul Larson Approve
Review via email: mp+348526@code.launchpad.net

Description of the change

The arm_vfp_support did not work on arm64 devices and was also subject to problems if syslog managed such that capability info was no longer available.

Although there are other ways to test this, checking for some flags seems the simplest at the moment.

To post a comment you must log in.
Revision history for this message
Paul Larson (pwlars) wrote :

cool, +1

review: Approve
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

+1 nice use of template fields

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/units/cpu/jobs.pxu b/units/cpu/jobs.pxu
2index db0dd8f..adf34b9 100644
3--- a/units/cpu/jobs.pxu
4+++ b/units/cpu/jobs.pxu
5@@ -100,18 +100,37 @@ command: nice -n -20 frequency_governors_test --debug
6 _description:
7 This test checks that CPU frequency governors are obeyed when set.
8
9+unit: template
10+template-resource: cpuinfo
11+template-filter: cpuinfo.platform == 'armv7l'
12+template-unit: job
13 plugin: shell
14 category_id: com.canonical.plainbox::cpu
15-id: cpu/arm_vfp_support
16+id: cpu/arm_vfp_support_{platform}
17 estimated_duration: 1.0
18-requires:
19- cpuinfo.platform in ("armv7l", "aarch64")
20 user: root
21-command: grep VFP /var/log/syslog
22+command:
23+ echo "{other}" | grep "vfp\|vfpv3\|vfpv4\|vfpd32"
24+_summary:
25+ Validate that the Vector Floating Point Unit is running on {platform} device
26+_description:
27+ Validate that the Vector Floating Point Unit is running on {platform} device.
28+
29+unit: template
30+template-resource: cpuinfo
31+template-filter: cpuinfo.platform == 'aarch64'
32+template-unit: job
33+plugin: shell
34+category_id: com.canonical.plainbox::cpu
35+id: cpu/arm_vfp_support_{platform}
36+estimated_duration: 1.0
37+user: root
38+command:
39+ echo "{other}" | grep "fp"
40 _summary:
41- Validate that the Vector Floating Point Unit is running on ARM device
42+ Validate that the Floating Point Unit is running on {platform} device
43 _description:
44- Validate that the Vector Floating Point Unit is running on ARM device.
45+ Validate that the Floating Point Unit is running on {platform} device.
46
47 plugin:shell
48 id: cpu/cstates

Subscribers

People subscribed via source and target branches