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

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

Issue 18177003: Revert 209071 "components/webdata: Break the dependency on chrom..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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
« no previous file with comments | « no previous file | trunk/src/chrome/unit_tests.isolate » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 8
9 from pylib import android_commands 9 from pylib import android_commands
10 from pylib import constants 10 from pylib import constants
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 'chrome/test/data/extensions/json_schema_test.js', 59 'chrome/test/data/extensions/json_schema_test.js',
60 'chrome/test/data/History/', 60 'chrome/test/data/History/',
61 'chrome/test/data/json_schema_validator/', 61 'chrome/test/data/json_schema_validator/',
62 'chrome/test/data/pref_service/', 62 'chrome/test/data/pref_service/',
63 'chrome/test/data/simple_open_search.xml', 63 'chrome/test/data/simple_open_search.xml',
64 'chrome/test/data/top_sites/', 64 'chrome/test/data/top_sites/',
65 'chrome/test/data/web_app_info/', 65 'chrome/test/data/web_app_info/',
66 'chrome/test/data/web_database', 66 'chrome/test/data/web_database',
67 'chrome/test/data/webui/', 67 'chrome/test/data/webui/',
68 'chrome/third_party/mock4js/', 68 'chrome/third_party/mock4js/',
69 'components/test/data/',
70 'net/data/ssl/certificates', 69 'net/data/ssl/certificates',
71 'third_party/accessibility-developer-tools/gen/axs_testing.js', 70 'third_party/accessibility-developer-tools/gen/axs_testing.js',
72 'third_party/zlib/google/test/data', 71 'third_party/zlib/google/test/data',
73 ] 72 ]
74 # The following are spell check data. Now only list the data under 73 # The following are spell check data. Now only list the data under
75 # third_party/hunspell_dictionaries which are used by unit tests. 74 # third_party/hunspell_dictionaries which are used by unit tests.
76 old_cwd = os.getcwd() 75 old_cwd = os.getcwd()
77 os.chdir(constants.DIR_SOURCE_ROOT) 76 os.chdir(constants.DIR_SOURCE_ROOT)
78 test_files += glob.glob('third_party/hunspell_dictionaries/*.bdic') 77 test_files += glob.glob('third_party/hunspell_dictionaries/*.bdic')
79 os.chdir(old_cwd) 78 os.chdir(old_cwd)
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 self.LaunchChromeTestServerSpawner() 344 self.LaunchChromeTestServerSpawner()
346 self.tool.SetupEnvironment() 345 self.tool.SetupEnvironment()
347 346
348 #override 347 #override
349 def TearDown(self): 348 def TearDown(self):
350 """Cleans up the test enviroment for the test suite.""" 349 """Cleans up the test enviroment for the test suite."""
351 self.tool.CleanUpEnvironment() 350 self.tool.CleanUpEnvironment()
352 if self._cleanup_test_files: 351 if self._cleanup_test_files:
353 self.adb.RemovePushedFiles() 352 self.adb.RemovePushedFiles()
354 super(TestRunner, self).TearDown() 353 super(TestRunner, self).TearDown()
OLDNEW
« no previous file with comments | « no previous file | trunk/src/chrome/unit_tests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698