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

Unified Diff: build/android/pylib/instrumentation/test_runner.py

Issue 444243002: Test Runner changes for Integration tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Annotation change and new-line escapes. Created 6 years, 4 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 | « build/android/pylib/instrumentation/test_jar.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/pylib/instrumentation/test_runner.py
diff --git a/build/android/pylib/instrumentation/test_runner.py b/build/android/pylib/instrumentation/test_runner.py
index 5711291a20af39403301e75662638768e44b3e08..04e167230f23ce6fdaee0183cf487418eb755513 100644
--- a/build/android/pylib/instrumentation/test_runner.py
+++ b/build/android/pylib/instrumentation/test_runner.py
@@ -166,7 +166,8 @@ class TestRunner(base_test_runner.BaseTestRunner):
self.flags.AddFlags(['--disable-fre', '--enable-test-intents'])
if self.options.device_flags:
with open(self.options.device_flags) as device_flags_file:
- self.flags.AddFlags(list(device_flags_file))
+ self.flags.AddFlags([flag.replace('\n','') \
+ for flag in device_flags_file if flag != '\n'])
def TearDown(self):
"""Cleans up the test harness and saves outstanding data from test run."""
« no previous file with comments | « build/android/pylib/instrumentation/test_jar.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698