Merge lp:~cypressyew/checkbox/intel_driver into lp:checkbox

Proposed by Po-Hsu Lin
Status: Merged
Approved by: Zygmunt Krynicki
Approved revision: 2664
Merged at revision: 2665
Proposed branch: lp:~cypressyew/checkbox/intel_driver
Merge into: lp:checkbox
Diff against target: 52 lines (+18/-0)
2 files modified
checkbox-old/CHANGELOG (+4/-0)
checkbox-old/scripts/graphics_driver (+14/-0)
To merge this branch: bzr merge lp:~cypressyew/checkbox/intel_driver
Reviewer Review Type Date Requested Status
Zygmunt Krynicki (community) Approve
Review via email: mp+205928@code.launchpad.net

Description of the change

added a new pattern for parsing Intel driver on 12.04.4

I tried to make this universal, but the "EDID" pattern cannot be found on some system (as described in the bug linked here), and the "switch to mode" sometimes cannot be found as well.

Using these two patterns altogether might be a solution for now.

To post a comment you must log in.
Revision history for this message
Zygmunt Krynicki (zyga) wrote :

Looks good to me.

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'checkbox-old/CHANGELOG'
2--- checkbox-old/CHANGELOG 2014-02-11 18:53:19 +0000
3+++ checkbox-old/CHANGELOG 2014-02-12 10:47:58 +0000
4@@ -1,5 +1,9 @@
5 checkbox (0.17.4) UNRELEASED; urgency=low
6
7+ [ Po-Hsu Lin]
8+ * scripts/graphics_driver: added a new pattern for parsing Intel driver on
9+ 12.04.4 (LP: #1279222)
10+
11 [ Jeff Lane ]
12 * Removed server-cert.whitelist. Forked server-selftest.whitelist to have a
13 new 14.04 only version for Trusty testing. This is the foundation for 14.04
14
15=== modified file 'checkbox-old/scripts/graphics_driver'
16--- checkbox-old/scripts/graphics_driver 2013-05-29 07:50:30 +0000
17+++ checkbox-old/scripts/graphics_driver 2014-02-12 10:47:58 +0000
18@@ -169,6 +169,8 @@
19 continue
20
21 # EDID and Modelines
22+ # We use this part to determine which driver is in use
23+ # For Intel / RADEON
24 m = re.search(r'\(II\) (.*)\(\d+\): EDID for output (.*)', line)
25 if m:
26 self.displays[display_name] = display
27@@ -186,6 +188,7 @@
28 display = {'Output': display_name}
29 continue
30
31+ # For NVIDIA
32 m = re.search(r'\(II\) (.*)\(\d+\): Setting mode "(.*?):', line)
33 if m:
34 self.displays[display_name] = display
35@@ -194,6 +197,17 @@
36 display = {'Output': display_name}
37 continue
38
39+ # For 4th Intel on 3.11
40+ m = re.search(
41+ r'\(II\) (.*)\(\d+\): switch to mode .* using (.*),', line)
42+ if m:
43+ self.displays[display_name] = display
44+ self.video_driver = m.group(1)
45+ display_name = m.group(2)
46+ display = {'Output': display_name}
47+ continue
48+
49+
50 m = re.search(
51 r'Manufacturer: (.*) *Model: (.*) *Serial#: (.*)', line)
52 if m:

Subscribers

People subscribed via source and target branches