Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(25)

Unified Diff: client/tests/lmbench/lmbench.py

Issue 1595019: Merge remote branch 'origin/upstream' into tempbranch (Closed)
Patch Set: Created 10 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: client/tests/lmbench/lmbench.py
diff --git a/client/tests/lmbench/lmbench.py b/client/tests/lmbench/lmbench.py
index e440f503779fa87becb2a2065520bdad9ecc6255..33a86b4f0bf3b05d392d55573e683fe4f8f1c698 100644
--- a/client/tests/lmbench/lmbench.py
+++ b/client/tests/lmbench/lmbench.py
@@ -28,7 +28,10 @@ class lmbench(test.test):
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')
« no previous file with comments | « client/tests/lmbench/0002-Changing-shebangs-on-lmbench-scripts.patch ('k') | client/tests/profiler_sync/profiler_sync.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698