Merge remote branch 'origin/upstream' into tempbranch

client/tests/lmbench/lmbench.py

 # This will need more work on the configuration stuff before it will function
 import os
 from autotest_lib.client.bin import test, utils
 from autotest_lib.client.common_lib import error
 
 
 class lmbench(test.test):
     version = 4
 
     def initialize(self):
@@ skipping 10 matching lines @@
         @param fsdir: Directory where file system tests will run
                 (defaults to standard test temp dir).
         @param file: Path to the file lmbench will use for status output
                 (defaults to a random named file inside standard test temp dir).
         @see: http://www.bitmover.com/lm/lmbench/lmbench3.tar.gz
                 (original tarball, shipped as is in autotest).
         """
         tarball = utils.unmap_url(self.bindir, tarball, self.tmpdir)
         utils.extract_tarball_to_dir(tarball, self.srcdir)
         os.chdir(self.srcdir)
-        utils.system('patch -p1 < ../lmbench3.diff')
+        p1 = 'patch -p1 < ../0001-Fix-build-issues-with-lmbench.patch'
+        p2 = 'patch -p1 < ../0002-Changing-shebangs-on-lmbench-scripts.patch'
+        utils.system(p1)
+        utils.system(p2)
 
         # build lmbench
         utils.system('make')
 
         # configure lmbench
         utils.system('yes "" | make config')
 
         # find the lmbench config file
         config_files = utils.system_output('ls -1 bin/*/CONFIG*').splitlines()
         if len(config_files) != 1:
@@ skipping 18 matching lines @@
     def run_once(self):
         os.chdir(self.srcdir)
         utils.system('make rerun')
 
 
     def postprocess(self):
         # Get the results:
         outputdir = self.srcdir + "/results"
         results = self.resultsdir + "/summary.txt"
         utils.system("make -C " + outputdir + " summary > " + results)