From 9aac87c318c987f791bd08a994b7ca86515223d7 Mon Sep 17 00:00:00 2001 From: nednguyen Date: Tue, 13 Oct 2015 08:10:27 -0700 Subject: [Telemetry] Add unittest_runner that uses project_config for environment config. Main changes: + Create tools/telemetry/testing/unittest_runner.py that contains the logic for running unittest using telemetry's project_config. + Move tools/perf/core/binary_dependencies.json & tools/perf/core/chromium_config.py to tools/perf/chrome_telemetry_build + Create gpu_project_config.py that contains the config for both gpu's run_gpu_test & run_unittest script. + Modify telemetry/run_tests, perf/run_tests, gpu/run_unittests to use telemetry's unittest_runner BUG=541439 Review URL: https://codereview.chromium.org/1393793003 Cr-Commit-Position: refs/heads/master@{#353753} --- tools/perf/core/binary_dependencies.json | 24 -------------------- tools/perf/core/chromium_config.py | 38 -------------------------------- 2 files changed, 62 deletions(-) delete mode 100644 tools/perf/core/binary_dependencies.json delete mode 100644 tools/perf/core/chromium_config.py (limited to 'tools/perf/core') diff --git a/tools/perf/core/binary_dependencies.json b/tools/perf/core/binary_dependencies.json deleted file mode 100644 index 8eabd83..0000000 --- a/tools/perf/core/binary_dependencies.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "config_type": "BaseConfig", - "dependencies": { - "crash_service": { - "file_info": { - "win_AMD64": { - "local_paths": [ - "../../../out/Debug/crash_service.exe", - "../../../out/Release/crash_service.exe" - ] - } - } - }, - "generate_breakpad_symbols": { - "file_info": { - "win_AMD64": { - "local_paths": [ - "../../../components/crash/content/tools/generate_breakpad_symbols.py" - ] - } - } - } - } -} diff --git a/tools/perf/core/chromium_config.py b/tools/perf/core/chromium_config.py deleted file mode 100644 index f7848c3..0000000 --- a/tools/perf/core/chromium_config.py +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright (c) 2015 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 sys - -from core import path_util - -sys.path.append(path_util.GetTelemetryDir()) -from telemetry import project_config - - -CLIENT_CONFIG_PATH = os.path.join( - path_util.GetPerfDir(), 'core', 'binary_dependencies.json') - - -class ChromiumConfig(project_config.ProjectConfig): - def __init__(self, top_level_dir=None, benchmark_dirs=None, - client_config=CLIENT_CONFIG_PATH, - chromium_src_dir=path_util.GetChromiumSrcDir()): - - if not benchmark_dirs: - benchmark_dirs = [path_util.GetPerfBenchmarksDir()] - logging.info('No benchmark directories specified. Defaulting to %s', - benchmark_dirs) - if not top_level_dir: - top_level_dir = path_util.GetPerfDir() - logging.info('No top level directory specified. Defaulting to %s', - top_level_dir) - - super(ChromiumConfig, self).__init__( - top_level_dir=top_level_dir, benchmark_dirs=benchmark_dirs, - client_config=client_config) - - self._chromium_src_dir = chromium_src_dir - -- cgit v1.1