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

Unified Diff: build/android/pylib/gtest/gtest_test_instance.py

Issue 2392643003: Removes files from //build that we don't need (Closed)
Patch Set: Created 4 years, 2 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/gtest/gtest_config.py ('k') | build/android/pylib/gtest/gtest_test_instance_test.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/pylib/gtest/gtest_test_instance.py
diff --git a/build/android/pylib/gtest/gtest_test_instance.py b/build/android/pylib/gtest/gtest_test_instance.py
deleted file mode 100644
index 3285e0b698529a91b09817e9f9448a00cac94d87..0000000000000000000000000000000000000000
--- a/build/android/pylib/gtest/gtest_test_instance.py
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 2014 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import logging
-import os
-import re
-import shutil
-import sys
-import tempfile
-
-from pylib import constants
-from pylib.base import base_test_result
-from pylib.base import test_instance
-from pylib.utils import apk_helper
-
-sys.path.append(os.path.join(
- constants.DIR_SOURCE_ROOT, 'build', 'util', 'lib', 'common'))
-import unittest_util
-
-
-BROWSER_TEST_SUITES = [
- 'components_browsertests',
- 'content_browsertests',
-]
-
-
-_DEFAULT_ISOLATE_FILE_PATHS = {
- 'base_unittests': 'base/base_unittests.isolate',
- 'blink_heap_unittests':
- 'third_party/WebKit/Source/platform/heap/BlinkHeapUnitTests.isolate',
- 'breakpad_unittests': 'breakpad/breakpad_unittests.isolate',
- 'cc_perftests': 'cc/cc_perftests.isolate',
- 'components_browsertests': 'components/components_browsertests.isolate',
- 'components_unittests': 'components/components_unittests.isolate',
- 'content_browsertests': 'content/content_browsertests.isolate',
- 'content_unittests': 'content/content_unittests.isolate',
- 'media_perftests': 'media/media_perftests.isolate',
- 'media_unittests': 'media/media_unittests.isolate',
- 'midi_unittests': 'media/midi/midi_unittests.isolate',
- 'net_unittests': 'net/net_unittests.isolate',
- 'sql_unittests': 'sql/sql_unittests.isolate',
- 'sync_unit_tests': 'sync/sync_unit_tests.isolate',
- 'ui_base_unittests': 'ui/base/ui_base_tests.isolate',
- 'unit_tests': 'chrome/unit_tests.isolate',
- 'webkit_unit_tests':
- 'third_party/WebKit/Source/web/WebKitUnitTests.isolate',
-}
-
-
-# Used for filtering large data deps at a finer grain than what's allowed in
-# isolate files since pushing deps to devices is expensive.
-# Wildcards are allowed.
-_DEPS_EXCLUSION_LIST = [
- 'chrome/test/data/extensions/api_test',
- 'chrome/test/data/extensions/secure_shell',
- 'chrome/test/data/firefox*',
- 'chrome/test/data/gpu',
- 'chrome/test/data/image_decoding',
- 'chrome/test/data/import',
- 'chrome/test/data/page_cycler',
- 'chrome/test/data/perf',
- 'chrome/test/data/pyauto_private',
- 'chrome/test/data/safari_import',
- 'chrome/test/data/scroll',
- 'chrome/test/data/third_party',
- 'third_party/hunspell_dictionaries/*.dic',
- # crbug.com/258690
- 'webkit/data/bmp_decoder',
- 'webkit/data/ico_decoder',
-]
-
-
-_EXTRA_NATIVE_TEST_ACTIVITY = (
- 'org.chromium.native_test.NativeTestInstrumentationTestRunner.'
- 'NativeTestActivity')
-_EXTRA_SHARD_SIZE_LIMIT =(
- 'org.chromium.native_test.NativeTestInstrumentationTestRunner.'
- 'ShardSizeLimit')
-
-# TODO(jbudorick): Remove these once we're no longer parsing stdout to generate
-# results.
-_RE_TEST_STATUS = re.compile(
- r'\[ +((?:RUN)|(?:FAILED)|(?:OK)) +\] ?([^ ]+)(?: \((\d+) ms\))?$')
-_RE_TEST_RUN_STATUS = re.compile(
- r'\[ +(PASSED|RUNNER_FAILED|CRASHED) \] ?[^ ]+')
-
-
-# TODO(jbudorick): Make this a class method of GtestTestInstance once
-# test_package_apk and test_package_exe are gone.
-def ParseGTestListTests(raw_list):
- """Parses a raw test list as provided by --gtest_list_tests.
-
- Args:
- raw_list: The raw test listing with the following format:
-
- IPCChannelTest.
- SendMessageInChannelConnected
- IPCSyncChannelTest.
- Simple
- DISABLED_SendWithTimeoutMixedOKAndTimeout
-
- Returns:
- A list of all tests. For the above raw listing:
-
- [IPCChannelTest.SendMessageInChannelConnected, IPCSyncChannelTest.Simple,
- IPCSyncChannelTest.DISABLED_SendWithTimeoutMixedOKAndTimeout]
- """
- ret = []
- current = ''
- for test in raw_list:
- if not test:
- continue
- if test[0] != ' ':
- test_case = test.split()[0]
- if test_case.endswith('.'):
- current = test_case
- elif not 'YOU HAVE' in test:
- test_name = test.split()[0]
- ret += [current + test_name]
- return ret
-
-
-class GtestTestInstance(test_instance.TestInstance):
-
- def __init__(self, args, isolate_delegate, error_func):
- super(GtestTestInstance, self).__init__()
- # TODO(jbudorick): Support multiple test suites.
- if len(args.suite_name) > 1:
- raise ValueError('Platform mode currently supports only 1 gtest suite')
- self._suite = args.suite_name[0]
-
- self._apk_path = os.path.join(
- constants.GetOutDirectory(), '%s_apk' % self._suite,
- '%s-debug.apk' % self._suite)
- self._exe_path = os.path.join(constants.GetOutDirectory(),
- self._suite)
- if not os.path.exists(self._apk_path):
- self._apk_path = None
- self._activity = None
- self._package = None
- self._runner = None
- else:
- helper = apk_helper.ApkHelper(self._apk_path)
- self._activity = helper.GetActivityName()
- self._package = helper.GetPackageName()
- self._runner = helper.GetInstrumentationName()
- self._extras = {
- _EXTRA_NATIVE_TEST_ACTIVITY: self._activity,
- }
- if self._suite in BROWSER_TEST_SUITES:
- self._extras[_EXTRA_SHARD_SIZE_LIMIT] = 1
-
- if not os.path.exists(self._exe_path):
- self._exe_path = None
- if not self._apk_path and not self._exe_path:
- error_func('Could not find apk or executable for %s' % self._suite)
-
- self._data_deps = []
- if args.test_filter:
- self._gtest_filter = args.test_filter
- elif args.test_filter_file:
- with open(args.test_filter_file, 'r') as f:
- self._gtest_filter = ':'.join(l.strip() for l in f)
- else:
- self._gtest_filter = None
-
- if not args.isolate_file_path:
- default_isolate_file_path = _DEFAULT_ISOLATE_FILE_PATHS.get(self._suite)
- if default_isolate_file_path:
- args.isolate_file_path = os.path.join(
- constants.DIR_SOURCE_ROOT, default_isolate_file_path)
-
- if args.isolate_file_path:
- self._isolate_abs_path = os.path.abspath(args.isolate_file_path)
- self._isolate_delegate = isolate_delegate
- self._isolated_abs_path = os.path.join(
- constants.GetOutDirectory(), '%s.isolated' % self._suite)
- else:
- logging.warning('No isolate file provided. No data deps will be pushed.');
- self._isolate_delegate = None
-
- if args.app_data_files:
- self._app_data_files = args.app_data_files
- if args.app_data_file_dir:
- self._app_data_file_dir = args.app_data_file_dir
- else:
- self._app_data_file_dir = tempfile.mkdtemp()
- logging.critical('Saving app files to %s', self._app_data_file_dir)
- else:
- self._app_data_files = None
- self._app_data_file_dir = None
-
- #override
- def TestType(self):
- return 'gtest'
-
- #override
- def SetUp(self):
- """Map data dependencies via isolate."""
- if self._isolate_delegate:
- self._isolate_delegate.Remap(
- self._isolate_abs_path, self._isolated_abs_path)
- self._isolate_delegate.PurgeExcluded(_DEPS_EXCLUSION_LIST)
- self._isolate_delegate.MoveOutputDeps()
- dest_dir = None
- if self._suite == 'breakpad_unittests':
- dest_dir = '/data/local/tmp/'
- self._data_deps.extend([(constants.ISOLATE_DEPS_DIR, dest_dir)])
-
-
- def GetDataDependencies(self):
- """Returns the test suite's data dependencies.
-
- Returns:
- A list of (host_path, device_path) tuples to push. If device_path is
- None, the client is responsible for determining where to push the file.
- """
- return self._data_deps
-
- def FilterTests(self, test_list, disabled_prefixes=None):
- """Filters |test_list| based on prefixes and, if present, a filter string.
-
- Args:
- test_list: The list of tests to filter.
- disabled_prefixes: A list of test prefixes to filter. Defaults to
- DISABLED_, FLAKY_, FAILS_, PRE_, and MANUAL_
- Returns:
- A filtered list of tests to run.
- """
- gtest_filter_strings = [
- self._GenerateDisabledFilterString(disabled_prefixes)]
- if self._gtest_filter:
- gtest_filter_strings.append(self._gtest_filter)
-
- filtered_test_list = test_list
- for gtest_filter_string in gtest_filter_strings:
- logging.debug('Filtering tests using: %s', gtest_filter_string)
- filtered_test_list = unittest_util.FilterTestNames(
- filtered_test_list, gtest_filter_string)
- return filtered_test_list
-
- def _GenerateDisabledFilterString(self, disabled_prefixes):
- disabled_filter_items = []
-
- if disabled_prefixes is None:
- disabled_prefixes = ['DISABLED_', 'FLAKY_', 'FAILS_', 'PRE_', 'MANUAL_']
- disabled_filter_items += ['%s*' % dp for dp in disabled_prefixes]
- disabled_filter_items += ['*.%s*' % dp for dp in disabled_prefixes]
-
- disabled_tests_file_path = os.path.join(
- constants.DIR_SOURCE_ROOT, 'build', 'android', 'pylib', 'gtest',
- 'filter', '%s_disabled' % self._suite)
- if disabled_tests_file_path and os.path.exists(disabled_tests_file_path):
- with open(disabled_tests_file_path) as disabled_tests_file:
- disabled_filter_items += [
- '%s' % l for l in (line.strip() for line in disabled_tests_file)
- if l and not l.startswith('#')]
-
- return '*-%s' % ':'.join(disabled_filter_items)
-
- def ParseGTestOutput(self, output):
- """Parses raw gtest output and returns a list of results.
-
- Args:
- output: A list of output lines.
- Returns:
- A list of base_test_result.BaseTestResults.
- """
- results = []
- for l in output:
- matcher = _RE_TEST_STATUS.match(l)
- if matcher:
- result_type = None
- if matcher.group(1) == 'OK':
- result_type = base_test_result.ResultType.PASS
- elif matcher.group(1) == 'FAILED':
- result_type = base_test_result.ResultType.FAIL
-
- if result_type:
- test_name = matcher.group(2)
- duration = matcher.group(3) if matcher.group(3) else 0
- results.append(base_test_result.BaseTestResult(
- test_name, result_type, duration))
- logging.info(l)
- return results
-
- #override
- def TearDown(self):
- """Clear the mappings created by SetUp."""
- if self._isolate_delegate:
- self._isolate_delegate.Clear()
-
- @property
- def activity(self):
- return self._activity
-
- @property
- def apk(self):
- return self._apk_path
-
- @property
- def app_file_dir(self):
- return self._app_data_file_dir
-
- @property
- def app_files(self):
- return self._app_data_files
-
- @property
- def exe(self):
- return self._exe_path
-
- @property
- def extras(self):
- return self._extras
-
- @property
- def package(self):
- return self._package
-
- @property
- def runner(self):
- return self._runner
-
- @property
- def suite(self):
- return self._suite
-
« no previous file with comments | « build/android/pylib/gtest/gtest_config.py ('k') | build/android/pylib/gtest/gtest_test_instance_test.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698