Merge remote branch 'cros/upstream' into master

client/tests/hackbench/hackbench.py

 import os
 from autotest_lib.client.bin import test, utils
 
 
 class hackbench(test.test):
     """
     This module will run the hackbench benchmark. Hackbench is a benchmark for
     measuring the performance, overhead and scalability of the Linux scheduler.
     The C program was pick from Ingo Molnar's page.
 
     @author: Nikhil Rao (ncrao@google.com)
     @see: http://people.redhat.com/~mingo/cfs-scheduler/tools/hackbench.c
     """
     version = 1
     preserve_srcdir = True
 
 
     def setup(self):
         os.chdir(self.srcdir)
         if 'CC' in os.environ:
-          cc = '$CC'
+            cc = '$CC'
         else:
-          cc = 'cc'
+            cc = 'cc'
         utils.system('%s -lpthread hackbench.c -o hackbench' % cc)
 
 
     def initialize(self):
         self.job.require_gcc()
         self.results = None
 
 
     def run_once(self, num_groups=90):
         """
@@ skipping 13 matching lines @@
 
     def postprocess_iteration(self):
         """
         Pick up the results attribute and write it in the performance keyval.
         """
         lines = self.results.split('\n')
         for line in lines:
             if line.startswith('Time:'):
                 time_val = line.split()[1]
                 self.write_perf_keyval({'time': time_val})