commit aba1f72618fec4b790af63794f60062fe0c49cd9
author Simon Que <sque@chromium.org> Wed Jan 30 12:28:32 2013 -0800
committer ChromeBot <chrome-bot@google.com> Thu Jan 31 14:14:33 2013 -0800
tree 7302ab27f194560b3e720988c94c6096b7e2e4d5
parent 467cb2dba74d44eb4525a5760eeb50f7da31301e

client/site_tests: graphics_VTSwitch uses bmp format

Instead of raw RGB format.  BMP format is more easily viewable.

BUG=chromium-os:36417
TEST=graphics_VTSwitch passes

Change-Id: I748411e1fb5b281d34aa6a7ced2f43b2ba63a15a
Signed-off-by: Simon Que <sque@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/42337
Reviewed-by: Daniel Erat <derat@chromium.org>
Reviewed-by: Ilja H. Friedel <ihf@chromium.org>
Commit-Queue: Ilja H. Friedel <ihf@chromium.org>
Tested-by: Ilja H. Friedel <ihf@chromium.org>

client/site_tests/graphics_VTSwitch/graphics_VTSwitch.py

diff --git a/client/site_tests/graphics_VTSwitch/graphics_VTSwitch.py b/client/site_tests/graphics_VTSwitch/graphics_VTSwitch.py
index c4d62c4..38dbcde 100644
--- a/client/site_tests/graphics_VTSwitch/graphics_VTSwitch.py
+++ b/client/site_tests/graphics_VTSwitch/graphics_VTSwitch.py
@@ -142,11 +142,11 @@
 
     def _take_current_vt_screenshot(self):
         """
-        Captures a screenshot of the current VT screen in raw RGB pixel format.
+        Captures a screenshot of the current VT screen in BMP format.
         Returns the path of the screenshot file.
         """
         current_vt = int(utils.system_output('fgconsole'))
-        extension = 'rgb'
+        extension = 'bmp'
 
         # In VT1, X is running so use the screenshot function in cros_ui_test.
         if current_vt == 1:
@@ -156,7 +156,7 @@
         prefix = 'graphics_VTSwitch_VT2'
         next_index = len(glob.glob(
             os.path.join(self.resultsdir, '%s-*.%s' % (prefix, extension))))
-        filename = '%s-%d.rgba' % (prefix, next_index)
+        filename = '%s-%d.%s' % (prefix, next_index, extension)
         output_path = os.path.join(self.resultsdir, filename)
         return self._take_drm_screenshot(output_path)
 
@@ -164,7 +164,7 @@
     def _take_drm_screenshot(self, output_path):
         autotest_deps_path = os.path.join(self.autodir, 'deps')
         getfb_path = os.path.join(autotest_deps_path, 'gfxtest', 'getfb')
-        output = utils.system_output('%s %s' % (getfb_path, output_path))
+        output = utils.system_output('%s %s.rgba' % (getfb_path, output_path))
         for line in output.split('\n'):
             # Parse the getfb output for info about framebuffer size.  The line
             # should looks omething like:
@@ -172,12 +172,11 @@
             if line.startswith('Framebuffer info:'):
                 size = line.split(':')[1].split(',')[0].strip()
                 break
-        final_output_path = output_path + '.rgb'
-        utils.system('convert -depth 8 -size %s %s %s' %
-                     (size, output_path, final_output_path))
+        utils.system('convert -depth 8 -size %s %s.rgba %s' %
+                     (size, output_path, output_path))
 
-        logging.info('Saving screenshot to %s' % final_output_path)
-        return final_output_path
+        logging.info('Saving screenshot to %s' % output_path)
+        return output_path
 
 
     def _switch_to_vt(self, vt):