diff options
| author | kcarattini <kcarattini@chromium.org> | 2015-09-28 21:15:25 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-29 04:16:07 +0000 |
| commit | a2bab8d5dd883b6452420e6d776f00306526f0be (patch) | |
| tree | 0694411a3e1dbc48b149dded7b84792ff151a34c /tools/perf/core | |
| parent | 2c4017042ecfa61efc1dfbc8bed52d044b353def (diff) | |
| download | chromium_src-a2bab8d5dd883b6452420e6d776f00306526f0be.zip chromium_src-a2bab8d5dd883b6452420e6d776f00306526f0be.tar.gz chromium_src-a2bab8d5dd883b6452420e6d776f00306526f0be.tar.bz2 | |
Revert of Add crash_service to Telemetry's isolates. (patchset #8 id:180001 of https://codereview.chromium.org/1361523003/ )
Reason for revert:
Suspected build fail see https://code.google.com/p/chromium/issues/detail?id=536998 and https://code.google.com/p/chromium/issues/detail?id=537065
Original issue's description:
> Add crash_service to Telemetry's isolates.
>
> Switch to using binary_manager for the crash_service executable,
> eliminating downloads of this binary from cloud storage. (A follow-on
> CL will likely forbid the bots from downloading this and other
> executables from cloud storage entirely, rather than continuing to use
> this as a fallback path.)
>
> Telemetry's isolates are currently specified fairly differently for
> the GYP and GN builds; other CLs underway will unify their
> specification more.
>
> Follow up CL's will be needed to add the client config to gpu's tests.
>
> authors=kbr@,aiolos@
>
> BUG=466877
>
> Committed: https://crrev.com/6bdfb7dfb3ce2e571697629895089cffc42b48e6
> Cr-Commit-Position: refs/heads/master@{#351196}
TBR=phajdan.jr@chromium.org,dpranke@chromium.org,kbr@chromium.org,maruel@chromium.org,piman@chromium.org,aiolos@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=466877
Review URL: https://codereview.chromium.org/1379473002
Cr-Commit-Position: refs/heads/master@{#351256}
Diffstat (limited to 'tools/perf/core')
| -rw-r--r-- | tools/perf/core/binary_dependencies.json | 15 | ||||
| -rw-r--r-- | tools/perf/core/project_config.py | 20 |
2 files changed, 8 insertions, 27 deletions
diff --git a/tools/perf/core/binary_dependencies.json b/tools/perf/core/binary_dependencies.json deleted file mode 100644 index e0a4b2f..0000000 --- a/tools/perf/core/binary_dependencies.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "config_type": "BaseConfig", - "dependencies": { - "crash_service": { - "file_info": { - "win_AMD64": { - "local_paths": [ - "../../../out/Debug/crash_service.exe", - "../../../out/Release/crash_service.exe" - ] - } - } - } - } -} diff --git a/tools/perf/core/project_config.py b/tools/perf/core/project_config.py index df488c7..a82bf7e 100644 --- a/tools/perf/core/project_config.py +++ b/tools/perf/core/project_config.py @@ -5,21 +5,17 @@ import os import sys - -THIS_DIR = os.path.dirname(os.path.abspath(__file__)) -TOP_LEVEL_DIR = os.path.normpath(os.path.join(THIS_DIR, os.pardir)) -TELEMETRY_DIR = os.path.normpath(os.path.join( - TOP_LEVEL_DIR, os.pardir, 'telemetry')) - -sys.path.append(TELEMETRY_DIR) +sys.path.append(os.path.join( + os.path.dirname(__file__), os.pardir, os.pardir, 'telemetry')) from telemetry import benchmark_runner -binary_dependencies_file = os.path.join(THIS_DIR, 'binary_dependencies.json') +top_level_dir = os.path.dirname(os.path.realpath( + os.path.join(__file__, os.pardir))) config = benchmark_runner.ProjectConfig( - top_level_dir=TOP_LEVEL_DIR, - benchmark_dirs=[os.path.join(TOP_LEVEL_DIR, 'benchmarks')], - client_config=binary_dependencies_file) + top_level_dir=top_level_dir, + benchmark_dirs=[os.path.join(top_level_dir, 'benchmarks')]) -config.telemetry_dir = TELEMETRY_DIR +config.telemetry_dir = os.path.realpath(os.path.join( + top_level_dir, os.pardir, 'telemetry')) |