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

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

Issue 6539001: Merge remote branch 'cros/upstream' into master. (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/autotest.git@master
Patch Set: patch Created 9 years, 10 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
« no previous file with comments | « client/tests/signaltest/src/Makefile ('k') | client/tests/wb_kupdate/README » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: client/tests/tiobench/tiobench.py
diff --git a/client/tests/tiobench/tiobench.py b/client/tests/tiobench/tiobench.py
index 747fc26e395b68bd03211754b973e01ad9d71396..f249509b2c37f84d40c379aab0c94e2d54a7c9f6 100644
--- a/client/tests/tiobench/tiobench.py
+++ b/client/tests/tiobench/tiobench.py
@@ -10,7 +10,7 @@ class tiobench(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 < ../makefile.patch')
utils.system('make')
« no previous file with comments | « client/tests/signaltest/src/Makefile ('k') | client/tests/wb_kupdate/README » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698