Commit 1b95cf58 authored by Mikhail Khokhlov's avatar Mikhail Khokhlov Committed by Commit Bot

[tools/perf] Get Perfetto revision from DEPS file

An isolated script doesn't see git files, so it can't determine the
revision from repo. So we parse the DEPS file instead.

Bug: b/148778752
Change-Id: Ic156d48f983bb65792f904efdadf6929d9cbc961
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2139817Reviewed-by: default avatarEric Seckler <eseckler@chromium.org>
Commit-Queue: Mikhail Khokhlov <khokhlov@google.com>
Cr-Commit-Position: refs/heads/master@{#757053}
parent daf54579
...@@ -7,10 +7,13 @@ import("//build/util/generate_wrapper.gni") ...@@ -7,10 +7,13 @@ import("//build/util/generate_wrapper.gni")
generate_wrapper("upload_trace_processor") { generate_wrapper("upload_trace_processor") {
testonly = true testonly = true
data_deps = [ data_deps = [
"//third_party/catapult:telemetry_chrome_test_support",
"//third_party/perfetto/src/trace_processor:trace_processor_shell", "//third_party/perfetto/src/trace_processor:trace_processor_shell",
"//tools/perf/chrome_telemetry_build:telemetry_chrome_test_without_chrome",
] ]
data = [ "//third_party/perfetto" ] data = [
"//tools/perf/core/",
"//DEPS",
]
executable = "upload_trace_processor.py" executable = "upload_trace_processor.py"
wrapper_script = "$root_build_dir/upload_trace_processor" wrapper_script = "$root_build_dir/upload_trace_processor"
executable_args = [ executable_args = [
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
import argparse import argparse
import os import os
import subprocess import re
import sys import sys
# Add tools/perf to sys.path. # Add tools/perf to sys.path.
...@@ -20,11 +20,15 @@ from core.tbmv3 import trace_processor ...@@ -20,11 +20,15 @@ from core.tbmv3 import trace_processor
def _PerfettoRevision(): def _PerfettoRevision():
perfetto_dir = os.path.join(path_util.GetChromiumSrcDir(), 'third_party', deps_line_re = re.compile(
'perfetto') r".*'/platform/external/perfetto.git' \+ '@' \+ '([a-f0-9]+)'")
revision = subprocess.check_output( deps_file = os.path.join(path_util.GetChromiumSrcDir(), 'DEPS')
['git', '-C', perfetto_dir, 'rev-parse', 'HEAD']) with open(deps_file) as deps:
return revision.strip() for line in deps:
match = deps_line_re.match(line)
if match:
return match.group(1)
raise RuntimeError("Couldn't parse perfetto revision from DEPS")
def main(args): def main(args):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment