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

Side by Side Diff: build/android/pylib/gtest/test_package_apk.py

Issue 15942016: Creates a new test running script test_runner.py (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 6 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 unified diff | Download patch
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 5
6 import logging 6 import logging
7 import os 7 import os
8 import shlex 8 import shlex
9 import sys 9 import sys
10 import tempfile 10 import tempfile
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 p = self._WatchFifo(timeout=30 * self.tool.GetTimeoutScale()) 98 p = self._WatchFifo(timeout=30 * self.tool.GetTimeoutScale())
99 p.expect("<<ScopedMainEntryLogger") 99 p.expect("<<ScopedMainEntryLogger")
100 p.close() 100 p.close()
101 finally: 101 finally:
102 self.tool.CleanUpEnvironment() 102 self.tool.CleanUpEnvironment()
103 # We need to strip the trailing newline. 103 # We need to strip the trailing newline.
104 content = [line.rstrip() for line in p.before.splitlines()] 104 content = [line.rstrip() for line in p.before.splitlines()]
105 ret = self._ParseGTestListTests(content) 105 ret = self._ParseGTestListTests(content)
106 return ret 106 return ret
107 107
108 def CreateTestRunnerScript(self, gtest_filter, test_arguments): 108 def CreateTestRunnerScript(self, test_filter, test_arguments):
109 self._CreateTestRunnerScript('--gtest_filter=%s %s' % (gtest_filter, 109 self._CreateTestRunnerScript('--test_filter=%s %s' % (test_filter,
frankf 2013/06/11 02:50:15 gtest_filter is passed to the actual framework her
gkanwar 2013/06/12 01:27:32 Done.
110 test_arguments)) 110 test_arguments))
111 111
112 def RunTestsAndListResults(self): 112 def RunTestsAndListResults(self):
113 try: 113 try:
114 self.tool.SetupEnvironment() 114 self.tool.SetupEnvironment()
115 self._ClearFifo() 115 self._ClearFifo()
116 self._StartActivity() 116 self._StartActivity()
117 finally: 117 finally:
118 self.tool.CleanUpEnvironment() 118 self.tool.CleanUpEnvironment()
119 logfile = android_commands.NewLineNormalizer(sys.stdout) 119 logfile = android_commands.NewLineNormalizer(sys.stdout)
(...skipping 12 matching lines...) Expand all
132 if self._NeedsInstall(): 132 if self._NeedsInstall():
133 # Always uninstall the previous one (by activity name); we don't 133 # Always uninstall the previous one (by activity name); we don't
134 # know what was embedded in it. 134 # know what was embedded in it.
135 self.adb.ManagedInstall(self.test_suite_full, False, 135 self.adb.ManagedInstall(self.test_suite_full, False,
136 package_name=self._apk_package_name) 136 package_name=self._apk_package_name)
137 137
138 def _GetTestSuiteBaseName(self): 138 def _GetTestSuiteBaseName(self):
139 """Returns the base name of the test suite.""" 139 """Returns the base name of the test suite."""
140 # APK test suite names end with '-debug.apk' 140 # APK test suite names end with '-debug.apk'
141 return os.path.basename(self.test_suite).rsplit('-debug', 1)[0] 141 return os.path.basename(self.test_suite).rsplit('-debug', 1)[0]
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698