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

[Po-Hsu Lin]

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.

[Zygmunt Krynicki (zyga)]

Looks good to me.

+1

review: Approve

=== modified file 'checkbox-old/CHANGELOG'
--- checkbox-old/CHANGELOG	2014-02-11 18:53:19 +0000
+++ checkbox-old/CHANGELOG	2014-02-12 10:47:58 +0000
@@ -1,5 +1,9 @@
 checkbox (0.17.4) UNRELEASED; urgency=low
 
+  [ Po-Hsu Lin]
+  * scripts/graphics_driver: added a new pattern for parsing Intel driver on
+    12.04.4 (LP: #1279222) 
+
   [ Jeff Lane ]
   * Removed server-cert.whitelist.  Forked server-selftest.whitelist to have a
     new 14.04 only version for Trusty testing. This is the foundation for 14.04

=== modified file 'checkbox-old/scripts/graphics_driver'
--- checkbox-old/scripts/graphics_driver	2013-05-29 07:50:30 +0000
+++ checkbox-old/scripts/graphics_driver	2014-02-12 10:47:58 +0000
@@ -169,6 +169,8 @@
                 continue
 
             # EDID and Modelines
+            # We use this part to determine which driver is in use
+            # For Intel / RADEON
             m = re.search(r'\(II\) (.*)\(\d+\): EDID for output (.*)', line)
             if m:
                 self.displays[display_name] = display
@@ -186,6 +188,7 @@
                 display = {'Output': display_name}
                 continue
 
+            # For NVIDIA
             m = re.search(r'\(II\) (.*)\(\d+\): Setting mode "(.*?):', line)
             if m:
                 self.displays[display_name] = display
@@ -194,6 +197,17 @@
                 display = {'Output': display_name}
                 continue
 
+            # For 4th Intel on 3.11
+            m = re.search(
+                r'\(II\) (.*)\(\d+\): switch to mode .* using (.*),', line)
+            if m:
+                self.displays[display_name] = display
+                self.video_driver = m.group(1)
+                display_name = m.group(2)
+                display = {'Output': display_name}
+                continue
+
+
             m = re.search(
                 r'Manufacturer: (.*) *Model: (.*) *Serial#: (.*)', line)
             if m: