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

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

Issue 18358005: Adds modules_unittest to ndk-apk script. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Updates according to comments Created 7 years, 5 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 | Annotate | Revision Log
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 import glob 5 import glob
6 import logging 6 import logging
7 import os 7 import os
8 import sys 8 import sys
9 9
10 from pylib import android_commands 10 from pylib import android_commands
11 from pylib import cmd_helper 11 from pylib import cmd_helper
12 from pylib import constants 12 from pylib import constants
13 from pylib import perf_tests_helper 13 from pylib import perf_tests_helper
14 from pylib.android_commands import errors 14 from pylib.android_commands import errors
15 from pylib.base import base_test_result 15 from pylib.base import base_test_result
16 from pylib.base import base_test_runner 16 from pylib.base import base_test_runner
17 from pylib.utils import run_tests_helper 17 from pylib.utils import run_tests_helper
18 18
19 import test_package_apk 19 import test_package_apk
20 import test_package_executable 20 import test_package_executable
21 21
22 sys.path.insert( 22 sys.path.insert(
23 0, os.path.join(constants.DIR_SOURCE_ROOT, 'tools', 'swarm_client')) 23 0, os.path.join(constants.DIR_SOURCE_ROOT, 'tools', 'swarm_client'))
24 import run_isolated 24 import run_isolated
25 25
26 26
27 _ISOLATE_FILE_PATHS = { 27 _ISOLATE_FILE_PATHS = {
28 'base_unittests': 'base/base_unittests.isolate', 28 'base_unittests': 'base/base_unittests.isolate',
29 'modules_unittests': 'third_party/webrtc/modules/modules_unittests.isolate',
29 #'net_unittests': 'net/net_unittests.isolate', 30 #'net_unittests': 'net/net_unittests.isolate',
30 #'unit_tests': 'chrome/unit_tests.isolate', 31 #'unit_tests': 'chrome/unit_tests.isolate',
31 #'content_browsertests': 'content/content_browsertests.isolate', 32 #'content_browsertests': 'content/content_browsertests.isolate',
32 #'content_unittests': 'content/content_unittests.isolate', 33 #'content_unittests': 'content/content_unittests.isolate',
33 } 34 }
34 _ISOLATE_SCRIPT = os.path.join( 35 _ISOLATE_SCRIPT = os.path.join(
35 constants.DIR_SOURCE_ROOT, 'tools', 'swarm_client', 'isolate.py') 36 constants.DIR_SOURCE_ROOT, 'tools', 'swarm_client', 'isolate.py')
36 37
37 38
38 def _GetDataFilesForTestSuite(product_dir, test_suite_basename): 39 def _GetDataFilesForTestSuite(product_dir, test_suite_basename):
(...skipping 345 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 self.LaunchChromeTestServerSpawner() 385 self.LaunchChromeTestServerSpawner()
385 self.tool.SetupEnvironment() 386 self.tool.SetupEnvironment()
386 387
387 #override 388 #override
388 def TearDown(self): 389 def TearDown(self):
389 """Cleans up the test enviroment for the test suite.""" 390 """Cleans up the test enviroment for the test suite."""
390 self.tool.CleanUpEnvironment() 391 self.tool.CleanUpEnvironment()
391 if self._cleanup_test_files: 392 if self._cleanup_test_files:
392 self.adb.RemovePushedFiles() 393 self.adb.RemovePushedFiles()
393 super(TestRunner, self).TearDown() 394 super(TestRunner, self).TearDown()
OLDNEW
« build/android/pylib/gtest/gtest_config.py ('K') | « build/android/pylib/gtest/gtest_config.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698