Add components which is requried to generate a GBB during factory.

client/common_lib/flashrom_util.py

 #!/usr/bin/env python
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """
 This module provides convenience routines to access Flash ROM (EEPROM).
  - flashrom_util is a low level wrapper of flashrom(8) program.
  - FlashromUtility is a high level object which provides more advanced
    features like journaling-alike (log-based) changing.
@@ skipping 470 matching lines @@
     def detect_chromeos_bios_layout(self, size, image):
         """ Detects standard ChromeOS BIOS layout.
             A short cut to detect_chromeos_layout(TARGET_BIOS, size, image). """
         return self.detect_chromeos_layout(self.TARGET_BIOS, size, image)
 
     def detect_chromeos_ec_layout(self, size, image):
         """ Detects standard ChromeOS Embedded Controller layout.
             A short cut to detect_chromeos_layout(TARGET_EC, size, image). """
         return self.detect_chromeos_layout(self.TARGET_EC, size, image)
 
+    def read_whole_to_file(self, output_file):
+        '''
+        Reads whole flash ROM data to a file.
+        Returns True on success, otherwise False.
+        '''
+        cmd = '%s"%s" -r "%s"' % (self.cmd_prefix, self.tool_path,
+                                  output_file)
+        if self.verbose:
+            print 'flashrom_util.read_whole_to_file(): ', cmd
+        return utils.system(cmd, ignore_status=True) == 0
+
     def read_whole(self):
         '''
         Reads whole flash ROM data.
         Returns the data read from flash ROM, or empty string for other error.
         '''
+        result = ''
         tmpfn = self._get_temp_filename('rd_')
-        cmd = '%s"%s" -r "%s"' % (self.cmd_prefix, self.tool_path, tmpfn)
-        if self.verbose:
-            print 'flashrom_util.read_whole(): ', cmd
-        result = ''
-
-        if utils.system(cmd, ignore_status=True) == 0:  # failure for non-zero
+        if self.read_whole_to_file(tmpfn):
             try:
                 result = open(tmpfn, 'rb').read()
             except IOError:
                 result = ''
 
         # clean temporary resources
         self._remove_temp_file(tmpfn)
         return result
 
     def _write_flashrom(self, base_image, layout_map, write_list):
@@ skipping 375 matching lines @@
     def get_arch(self):
         arch = os.popen('uname -m').read().rstrip()
         arch = re.sub(r"i\d86", r"i386", arch, 1)
         return arch
 
     def run_command(self, cmd, ignore_status=False):
         p = subprocess.Popen(cmd, shell=True,
                              stdout=subprocess.PIPE,
                              stderr=subprocess.PIPE)
         p.wait()
-        if p.returncode and not ignore_status:
-            raise TestError("failed to execute: %s\nError messages: %s" % (
-                cmd, p.stderr.read()))
+        if p.returncode:
+            err_msg = p.stderr.read()
+            print p.stdout.read()
+            print err_msg
+            if not ignore_status:
+                raise TestError("failed to execute: %s\nError messages: %s" % (
+                    cmd, err_msg))
         return (p.returncode, p.stdout.read())
 
     def system(self, cmd, ignore_status=False):
         (returncode, output) = self.run_command(cmd, ignore_status)
         return returncode
 
     def system_output(self, cmd, ignore_status=False):
         (returncode, output) = self.run_command(cmd, ignore_status)
         return output
 
 
 # import autotest or mock utilities
 try:
     # print 'using autotest'
     from autotest_lib.client.bin import test, utils
     from autotest_lib.client.common_lib.error import TestError
 except ImportError:
     # print 'using mocks'
     utils = mock_utils()
     TestError = mock_TestError
 
 
 # main stub
 if __name__ == "__main__":
     # TODO(hungte) provide unit tests or command line usage
     pass