First Commit
This commit is contained in:
4
externals/libyuv/tools_libyuv/OWNERS
vendored
Normal file
4
externals/libyuv/tools_libyuv/OWNERS
vendored
Normal file
@ -0,0 +1,4 @@
|
||||
mbonadei@chromium.org
|
||||
fbarchard@chromium.org
|
||||
pbos@chromium.org
|
||||
|
||||
509
externals/libyuv/tools_libyuv/autoroller/roll_deps.py
vendored
Normal file
509
externals/libyuv/tools_libyuv/autoroller/roll_deps.py
vendored
Normal file
@ -0,0 +1,509 @@
|
||||
#!/usr/bin/env vpython3
|
||||
|
||||
# Copyright 2017 The LibYuv Project Authors. All rights reserved.
|
||||
#
|
||||
# Use of this source code is governed by a BSD-style license
|
||||
# that can be found in the LICENSE file in the root of the source
|
||||
# tree. An additional intellectual property rights grant can be found
|
||||
# in the file PATENTS. All contributing project authors may
|
||||
# be found in the AUTHORS file in the root of the source tree.
|
||||
|
||||
# This is a modified copy of the script in
|
||||
# https://webrtc.googlesource.com/src/+/master/tools_webrtc/autoroller/roll_deps.py
|
||||
# customized for libyuv.
|
||||
|
||||
"""Script to automatically roll dependencies in the libyuv DEPS file."""
|
||||
|
||||
import argparse
|
||||
import base64
|
||||
import collections
|
||||
import logging
|
||||
import os
|
||||
import re
|
||||
import subprocess
|
||||
import sys
|
||||
import urllib.request
|
||||
|
||||
|
||||
# Skip these dependencies (list without solution name prefix).
|
||||
DONT_AUTOROLL_THESE = [
|
||||
'src/third_party/gflags/src',
|
||||
]
|
||||
|
||||
LIBYUV_URL = 'https://chromium.googlesource.com/libyuv/libyuv'
|
||||
CHROMIUM_SRC_URL = 'https://chromium.googlesource.com/chromium/src'
|
||||
CHROMIUM_COMMIT_TEMPLATE = CHROMIUM_SRC_URL + '/+/%s'
|
||||
CHROMIUM_LOG_TEMPLATE = CHROMIUM_SRC_URL + '/+log/%s'
|
||||
CHROMIUM_FILE_TEMPLATE = CHROMIUM_SRC_URL + '/+/%s/%s'
|
||||
|
||||
COMMIT_POSITION_RE = re.compile('^Cr-Commit-Position: .*#([0-9]+).*$')
|
||||
CLANG_REVISION_RE = re.compile(r'^CLANG_REVISION = \'([0-9a-z-]+)\'$')
|
||||
ROLL_BRANCH_NAME = 'roll_chromium_revision'
|
||||
|
||||
SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
|
||||
CHECKOUT_SRC_DIR = os.path.realpath(os.path.join(SCRIPT_DIR, os.pardir,
|
||||
os.pardir))
|
||||
CHECKOUT_ROOT_DIR = os.path.realpath(os.path.join(CHECKOUT_SRC_DIR, os.pardir))
|
||||
|
||||
sys.path.append(os.path.join(CHECKOUT_SRC_DIR, 'build'))
|
||||
import find_depot_tools # pylint: disable=wrong-import-position
|
||||
find_depot_tools.add_depot_tools_to_path()
|
||||
|
||||
CLANG_UPDATE_SCRIPT_URL_PATH = 'tools/clang/scripts/update.py'
|
||||
CLANG_UPDATE_SCRIPT_LOCAL_PATH = os.path.join(CHECKOUT_SRC_DIR, 'tools',
|
||||
'clang', 'scripts', 'update.py')
|
||||
|
||||
DepsEntry = collections.namedtuple('DepsEntry', 'path url revision')
|
||||
ChangedDep = collections.namedtuple('ChangedDep',
|
||||
'path url current_rev new_rev')
|
||||
|
||||
class RollError(Exception):
|
||||
pass
|
||||
|
||||
|
||||
def VarLookup(local_scope):
|
||||
return lambda var_name: local_scope['vars'][var_name]
|
||||
|
||||
|
||||
def ParseDepsDict(deps_content):
|
||||
local_scope = {}
|
||||
global_scope = {
|
||||
'Var': VarLookup(local_scope),
|
||||
'Str': lambda s: s,
|
||||
'deps_os': {},
|
||||
}
|
||||
exec(deps_content, global_scope, local_scope)
|
||||
return local_scope
|
||||
|
||||
|
||||
def ParseLocalDepsFile(filename):
|
||||
with open(filename, 'rb') as f:
|
||||
deps_content = f.read().decode('utf-8')
|
||||
return ParseDepsDict(deps_content)
|
||||
|
||||
|
||||
def ParseRemoteCrDepsFile(revision):
|
||||
deps_content = ReadRemoteCrFile('DEPS', revision)
|
||||
return ParseDepsDict(deps_content)
|
||||
|
||||
|
||||
def ParseCommitPosition(commit_message):
|
||||
for line in reversed(commit_message.splitlines()):
|
||||
m = COMMIT_POSITION_RE.match(line.strip())
|
||||
if m:
|
||||
return int(m.group(1))
|
||||
logging.error('Failed to parse commit position id from:\n%s\n',
|
||||
commit_message)
|
||||
sys.exit(-1)
|
||||
|
||||
|
||||
def _RunCommand(command, working_dir=None, ignore_exit_code=False,
|
||||
extra_env=None, input_data=None):
|
||||
"""Runs a command and returns the output from that command.
|
||||
|
||||
If the command fails (exit code != 0), the function will exit the process.
|
||||
|
||||
Returns:
|
||||
A tuple containing the stdout and stderr outputs as strings.
|
||||
"""
|
||||
working_dir = working_dir or CHECKOUT_SRC_DIR
|
||||
logging.debug('CMD: %s CWD: %s', ' '.join(command), working_dir)
|
||||
env = os.environ.copy()
|
||||
if extra_env:
|
||||
assert all(isinstance(value, str) for value in extra_env.values())
|
||||
logging.debug('extra env: %s', extra_env)
|
||||
env.update(extra_env)
|
||||
p = subprocess.Popen(command,
|
||||
stdin=subprocess.PIPE,
|
||||
stdout=subprocess.PIPE,
|
||||
stderr=subprocess.PIPE,
|
||||
env=env,
|
||||
cwd=working_dir,
|
||||
universal_newlines=True)
|
||||
std_output, err_output = p.communicate(input_data)
|
||||
p.stdout.close()
|
||||
p.stderr.close()
|
||||
if not ignore_exit_code and p.returncode != 0:
|
||||
logging.error('Command failed: %s\n'
|
||||
'stdout:\n%s\n'
|
||||
'stderr:\n%s\n', ' '.join(command), std_output, err_output)
|
||||
sys.exit(p.returncode)
|
||||
return std_output, err_output
|
||||
|
||||
|
||||
def _GetBranches():
|
||||
"""Returns a tuple of active,branches.
|
||||
|
||||
The 'active' is the name of the currently active branch and 'branches' is a
|
||||
list of all branches.
|
||||
"""
|
||||
lines = _RunCommand(['git', 'branch'])[0].split('\n')
|
||||
branches = []
|
||||
active = ''
|
||||
for line in lines:
|
||||
if '*' in line:
|
||||
# The assumption is that the first char will always be the '*'.
|
||||
active = line[1:].strip()
|
||||
branches.append(active)
|
||||
else:
|
||||
branch = line.strip()
|
||||
if branch:
|
||||
branches.append(branch)
|
||||
return active, branches
|
||||
|
||||
|
||||
def _ReadGitilesContent(url):
|
||||
# Download and decode BASE64 content until
|
||||
# https://code.google.com/p/gitiles/issues/detail?id=7 is fixed.
|
||||
base64_content = ReadUrlContent(url + '?format=TEXT')
|
||||
return base64.b64decode(base64_content[0]).decode('utf-8')
|
||||
|
||||
|
||||
def ReadRemoteCrFile(path_below_src, revision):
|
||||
"""Reads a remote Chromium file of a specific revision. Returns a string."""
|
||||
return _ReadGitilesContent(CHROMIUM_FILE_TEMPLATE % (revision,
|
||||
path_below_src))
|
||||
|
||||
|
||||
def ReadRemoteCrCommit(revision):
|
||||
"""Reads a remote Chromium commit message. Returns a string."""
|
||||
return _ReadGitilesContent(CHROMIUM_COMMIT_TEMPLATE % revision)
|
||||
|
||||
|
||||
def ReadUrlContent(url):
|
||||
"""Connect to a remote host and read the contents. Returns a list of lines."""
|
||||
conn = urllib.request.urlopen(url)
|
||||
try:
|
||||
return conn.readlines()
|
||||
except IOError as e:
|
||||
logging.exception('Error connecting to %s. Error: %s', url, e)
|
||||
raise
|
||||
finally:
|
||||
conn.close()
|
||||
|
||||
|
||||
def GetMatchingDepsEntries(depsentry_dict, dir_path):
|
||||
"""Gets all deps entries matching the provided path.
|
||||
|
||||
This list may contain more than one DepsEntry object.
|
||||
Example: dir_path='src/testing' would give results containing both
|
||||
'src/testing/gtest' and 'src/testing/gmock' deps entries for Chromium's DEPS.
|
||||
Example 2: dir_path='src/build' should return 'src/build' but not
|
||||
'src/buildtools'.
|
||||
|
||||
Returns:
|
||||
A list of DepsEntry objects.
|
||||
"""
|
||||
result = []
|
||||
for path, depsentry in depsentry_dict.items():
|
||||
if path == dir_path:
|
||||
result.append(depsentry)
|
||||
else:
|
||||
parts = path.split('/')
|
||||
if all(part == parts[i]
|
||||
for i, part in enumerate(dir_path.split('/'))):
|
||||
result.append(depsentry)
|
||||
return result
|
||||
|
||||
def BuildDepsentryDict(deps_dict):
|
||||
"""Builds a dict of paths to DepsEntry objects from a raw deps dict."""
|
||||
result = {}
|
||||
|
||||
def AddDepsEntries(deps_subdict):
|
||||
for path, deps_url_spec in deps_subdict.items():
|
||||
if isinstance(deps_url_spec, dict):
|
||||
if deps_url_spec.get('dep_type') == 'cipd':
|
||||
continue
|
||||
deps_url = deps_url_spec['url']
|
||||
else:
|
||||
deps_url = deps_url_spec
|
||||
if not path in result:
|
||||
url, revision = deps_url.split('@') if deps_url else (None, None)
|
||||
result[path] = DepsEntry(path, url, revision)
|
||||
|
||||
AddDepsEntries(deps_dict['deps'])
|
||||
for deps_os in ['win', 'mac', 'linux', 'android', 'ios', 'unix']:
|
||||
AddDepsEntries(deps_dict.get('deps_os', {}).get(deps_os, {}))
|
||||
return result
|
||||
|
||||
|
||||
def CalculateChangedDeps(libyuv_deps, new_cr_deps):
|
||||
"""
|
||||
Calculate changed deps entries based on entries defined in the libyuv DEPS
|
||||
file:
|
||||
- If a shared dependency with the Chromium DEPS file: roll it to the same
|
||||
revision as Chromium (i.e. entry in the new_cr_deps dict)
|
||||
- If it's a Chromium sub-directory, roll it to the HEAD revision (notice
|
||||
this means it may be ahead of the chromium_revision, but generally these
|
||||
should be close).
|
||||
- If it's another DEPS entry (not shared with Chromium), roll it to HEAD
|
||||
unless it's configured to be skipped.
|
||||
|
||||
Returns:
|
||||
A list of ChangedDep objects representing the changed deps.
|
||||
"""
|
||||
result = []
|
||||
libyuv_entries = BuildDepsentryDict(libyuv_deps)
|
||||
new_cr_entries = BuildDepsentryDict(new_cr_deps)
|
||||
for path, libyuv_deps_entry in libyuv_entries.items():
|
||||
if path in DONT_AUTOROLL_THESE:
|
||||
continue
|
||||
cr_deps_entry = new_cr_entries.get(path)
|
||||
if cr_deps_entry:
|
||||
# Use the revision from Chromium's DEPS file.
|
||||
new_rev = cr_deps_entry.revision
|
||||
assert libyuv_deps_entry.url == cr_deps_entry.url, (
|
||||
'Libyuv DEPS entry %s has a different URL (%s) than Chromium (%s).' %
|
||||
(path, libyuv_deps_entry.url, cr_deps_entry.url))
|
||||
else:
|
||||
# Use the HEAD of the deps repo.
|
||||
stdout, _ = _RunCommand(['git', 'ls-remote', libyuv_deps_entry.url,
|
||||
'HEAD'])
|
||||
new_rev = stdout.strip().split('\t')[0]
|
||||
|
||||
# Check if an update is necessary.
|
||||
if libyuv_deps_entry.revision != new_rev:
|
||||
logging.debug('Roll dependency %s to %s', path, new_rev)
|
||||
result.append(ChangedDep(path, libyuv_deps_entry.url,
|
||||
libyuv_deps_entry.revision, new_rev))
|
||||
return sorted(result)
|
||||
|
||||
|
||||
def CalculateChangedClang(new_cr_rev):
|
||||
def GetClangRev(lines):
|
||||
for line in lines:
|
||||
match = CLANG_REVISION_RE.match(line)
|
||||
if match:
|
||||
return match.group(1)
|
||||
raise RollError('Could not parse Clang revision from:\n' + '\n'.join(' ' + l for l in lines))
|
||||
|
||||
with open(CLANG_UPDATE_SCRIPT_LOCAL_PATH, 'r') as f:
|
||||
current_lines = f.readlines()
|
||||
current_rev = GetClangRev(current_lines)
|
||||
|
||||
new_clang_update_py = ReadRemoteCrFile(CLANG_UPDATE_SCRIPT_URL_PATH,
|
||||
new_cr_rev).splitlines()
|
||||
new_rev = GetClangRev(new_clang_update_py)
|
||||
return ChangedDep(CLANG_UPDATE_SCRIPT_LOCAL_PATH, None, current_rev, new_rev)
|
||||
|
||||
|
||||
def GenerateCommitMessage(current_cr_rev, new_cr_rev, current_commit_pos,
|
||||
new_commit_pos, changed_deps_list, clang_change):
|
||||
current_cr_rev = current_cr_rev[0:10]
|
||||
new_cr_rev = new_cr_rev[0:10]
|
||||
rev_interval = '%s..%s' % (current_cr_rev, new_cr_rev)
|
||||
git_number_interval = '%s:%s' % (current_commit_pos, new_commit_pos)
|
||||
|
||||
commit_msg = ['Roll chromium_revision %s (%s)\n' % (rev_interval,
|
||||
git_number_interval)]
|
||||
commit_msg.append('Change log: %s' % (CHROMIUM_LOG_TEMPLATE % rev_interval))
|
||||
commit_msg.append('Full diff: %s\n' % (CHROMIUM_COMMIT_TEMPLATE %
|
||||
rev_interval))
|
||||
if changed_deps_list:
|
||||
commit_msg.append('Changed dependencies:')
|
||||
|
||||
for c in changed_deps_list:
|
||||
commit_msg.append('* %s: %s/+log/%s..%s' % (c.path, c.url,
|
||||
c.current_rev[0:10],
|
||||
c.new_rev[0:10]))
|
||||
change_url = CHROMIUM_FILE_TEMPLATE % (rev_interval, 'DEPS')
|
||||
commit_msg.append('DEPS diff: %s\n' % change_url)
|
||||
else:
|
||||
commit_msg.append('No dependencies changed.')
|
||||
|
||||
if clang_change.current_rev != clang_change.new_rev:
|
||||
commit_msg.append('Clang version changed %s:%s' %
|
||||
(clang_change.current_rev, clang_change.new_rev))
|
||||
change_url = CHROMIUM_FILE_TEMPLATE % (rev_interval,
|
||||
CLANG_UPDATE_SCRIPT_URL_PATH)
|
||||
commit_msg.append('Details: %s\n' % change_url)
|
||||
else:
|
||||
commit_msg.append('No update to Clang.\n')
|
||||
|
||||
# TBR needs to be non-empty for Gerrit to process it.
|
||||
git_author = _RunCommand(['git', 'config', 'user.email'],
|
||||
working_dir=CHECKOUT_SRC_DIR)[0].strip()
|
||||
commit_msg.append('TBR=%s' % git_author)
|
||||
|
||||
commit_msg.append('BUG=None')
|
||||
return '\n'.join(commit_msg)
|
||||
|
||||
|
||||
def UpdateDepsFile(deps_filename, old_cr_revision, new_cr_revision,
|
||||
changed_deps):
|
||||
"""Update the DEPS file with the new revision."""
|
||||
|
||||
# Update the chromium_revision variable.
|
||||
with open(deps_filename, 'rb') as deps_file:
|
||||
deps_content = deps_file.read().decode('utf-8')
|
||||
deps_content = deps_content.replace(old_cr_revision, new_cr_revision)
|
||||
with open(deps_filename, 'wb') as deps_file:
|
||||
deps_file.write(deps_content.encode('utf-8'))
|
||||
|
||||
# Update each individual DEPS entry.
|
||||
for dep in changed_deps:
|
||||
local_dep_dir = os.path.join(CHECKOUT_ROOT_DIR, dep.path)
|
||||
if not os.path.isdir(local_dep_dir):
|
||||
raise RollError(
|
||||
'Cannot find local directory %s. Make sure the .gclient file\n'
|
||||
'contains all platforms in the target_os list, i.e.\n'
|
||||
'target_os = ["android", "unix", "mac", "ios", "win"];\n'
|
||||
'Then run "gclient sync" again.' % local_dep_dir)
|
||||
_RunCommand(
|
||||
['gclient', 'setdep', '--revision', '%s@%s' % (dep.path, dep.new_rev)],
|
||||
working_dir=CHECKOUT_SRC_DIR)
|
||||
|
||||
|
||||
def _IsTreeClean():
|
||||
stdout, _ = _RunCommand(['git', 'status', '--porcelain'])
|
||||
if len(stdout) == 0:
|
||||
return True
|
||||
|
||||
logging.error('Dirty/unversioned files:\n%s', stdout)
|
||||
return False
|
||||
|
||||
|
||||
def _EnsureUpdatedMasterBranch(dry_run):
|
||||
current_branch = _RunCommand(
|
||||
['git', 'rev-parse', '--abbrev-ref', 'HEAD'])[0].splitlines()[0]
|
||||
if current_branch != 'main':
|
||||
logging.error('Please checkout the main branch and re-run this script.')
|
||||
if not dry_run:
|
||||
sys.exit(-1)
|
||||
|
||||
logging.info('Updating main branch...')
|
||||
_RunCommand(['git', 'pull'])
|
||||
|
||||
|
||||
def _CreateRollBranch(dry_run):
|
||||
logging.info('Creating roll branch: %s', ROLL_BRANCH_NAME)
|
||||
if not dry_run:
|
||||
_RunCommand(['git', 'checkout', '-b', ROLL_BRANCH_NAME])
|
||||
|
||||
|
||||
def _RemovePreviousRollBranch(dry_run):
|
||||
active_branch, branches = _GetBranches()
|
||||
if active_branch == ROLL_BRANCH_NAME:
|
||||
active_branch = 'main'
|
||||
if ROLL_BRANCH_NAME in branches:
|
||||
logging.info('Removing previous roll branch (%s)', ROLL_BRANCH_NAME)
|
||||
if not dry_run:
|
||||
_RunCommand(['git', 'checkout', active_branch])
|
||||
_RunCommand(['git', 'branch', '-D', ROLL_BRANCH_NAME])
|
||||
|
||||
|
||||
def _LocalCommit(commit_msg, dry_run):
|
||||
logging.info('Committing changes locally.')
|
||||
if not dry_run:
|
||||
_RunCommand(['git', 'add', '--update', '.'])
|
||||
_RunCommand(['git', 'commit', '-m', commit_msg])
|
||||
|
||||
|
||||
def ChooseCQMode(skip_cq, cq_over, current_commit_pos, new_commit_pos):
|
||||
if skip_cq:
|
||||
return 0
|
||||
if (new_commit_pos - current_commit_pos) < cq_over:
|
||||
return 1
|
||||
return 2
|
||||
|
||||
|
||||
def _UploadCL(commit_queue_mode):
|
||||
"""Upload the committed changes as a changelist to Gerrit.
|
||||
|
||||
commit_queue_mode:
|
||||
- 2: Submit to commit queue.
|
||||
- 1: Run trybots but do not submit to CQ.
|
||||
- 0: Skip CQ, upload only.
|
||||
"""
|
||||
cmd = ['git', 'cl', 'upload', '--force', '--bypass-hooks', '--send-mail']
|
||||
if commit_queue_mode >= 2:
|
||||
logging.info('Sending the CL to the CQ...')
|
||||
cmd.extend(['-o', 'label=Bot-Commit+1'])
|
||||
cmd.extend(['-o', 'label=Commit-Queue+2'])
|
||||
elif commit_queue_mode >= 1:
|
||||
logging.info('Starting CQ dry run...')
|
||||
cmd.extend(['-o', 'label=Commit-Queue+1'])
|
||||
extra_env = {
|
||||
'EDITOR': 'true',
|
||||
'SKIP_GCE_AUTH_FOR_GIT': '1',
|
||||
}
|
||||
stdout, stderr = _RunCommand(cmd, extra_env=extra_env)
|
||||
logging.debug('Output from "git cl upload":\nstdout:\n%s\n\nstderr:\n%s',
|
||||
stdout, stderr)
|
||||
|
||||
|
||||
def main():
|
||||
p = argparse.ArgumentParser()
|
||||
p.add_argument('--clean', action='store_true', default=False,
|
||||
help='Removes any previous local roll branch.')
|
||||
p.add_argument('-r', '--revision',
|
||||
help=('Chromium Git revision to roll to. Defaults to the '
|
||||
'Chromium HEAD revision if omitted.'))
|
||||
p.add_argument('--dry-run', action='store_true', default=False,
|
||||
help=('Calculate changes and modify DEPS, but don\'t create '
|
||||
'any local branch, commit, upload CL or send any '
|
||||
'tryjobs.'))
|
||||
p.add_argument('-i', '--ignore-unclean-workdir', action='store_true',
|
||||
default=False,
|
||||
help=('Ignore if the current branch is not main or if there '
|
||||
'are uncommitted changes (default: %(default)s).'))
|
||||
grp = p.add_mutually_exclusive_group()
|
||||
grp.add_argument('--skip-cq', action='store_true', default=False,
|
||||
help='Skip sending the CL to the CQ (default: %(default)s)')
|
||||
grp.add_argument('--cq-over', type=int, default=1,
|
||||
help=('Commit queue dry run if the revision difference '
|
||||
'is below this number (default: %(default)s)'))
|
||||
p.add_argument('-v', '--verbose', action='store_true', default=False,
|
||||
help='Be extra verbose in printing of log messages.')
|
||||
opts = p.parse_args()
|
||||
|
||||
if opts.verbose:
|
||||
logging.basicConfig(level=logging.DEBUG)
|
||||
else:
|
||||
logging.basicConfig(level=logging.INFO)
|
||||
|
||||
if not opts.ignore_unclean_workdir and not _IsTreeClean():
|
||||
logging.error('Please clean your local checkout first.')
|
||||
return 1
|
||||
|
||||
if opts.clean:
|
||||
_RemovePreviousRollBranch(opts.dry_run)
|
||||
|
||||
if not opts.ignore_unclean_workdir:
|
||||
_EnsureUpdatedMasterBranch(opts.dry_run)
|
||||
|
||||
new_cr_rev = opts.revision
|
||||
if not new_cr_rev:
|
||||
stdout, _ = _RunCommand(['git', 'ls-remote', CHROMIUM_SRC_URL, 'HEAD'])
|
||||
head_rev = stdout.strip().split('\t')[0]
|
||||
logging.info('No revision specified. Using HEAD: %s', head_rev)
|
||||
new_cr_rev = head_rev
|
||||
|
||||
deps_filename = os.path.join(CHECKOUT_SRC_DIR, 'DEPS')
|
||||
libyuv_deps = ParseLocalDepsFile(deps_filename)
|
||||
current_cr_rev = libyuv_deps['vars']['chromium_revision']
|
||||
|
||||
current_commit_pos = ParseCommitPosition(ReadRemoteCrCommit(current_cr_rev))
|
||||
new_commit_pos = ParseCommitPosition(ReadRemoteCrCommit(new_cr_rev))
|
||||
|
||||
new_cr_deps = ParseRemoteCrDepsFile(new_cr_rev)
|
||||
changed_deps = CalculateChangedDeps(libyuv_deps, new_cr_deps)
|
||||
clang_change = CalculateChangedClang(new_cr_rev)
|
||||
commit_msg = GenerateCommitMessage(current_cr_rev, new_cr_rev,
|
||||
current_commit_pos, new_commit_pos,
|
||||
changed_deps, clang_change)
|
||||
logging.debug('Commit message:\n%s', commit_msg)
|
||||
|
||||
_CreateRollBranch(opts.dry_run)
|
||||
UpdateDepsFile(deps_filename, current_cr_rev, new_cr_rev, changed_deps)
|
||||
_LocalCommit(commit_msg, opts.dry_run)
|
||||
commit_queue_mode = ChooseCQMode(opts.skip_cq, opts.cq_over,
|
||||
current_commit_pos, new_commit_pos)
|
||||
logging.info('Uploading CL...')
|
||||
if not opts.dry_run:
|
||||
_UploadCL(commit_queue_mode)
|
||||
return 0
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
sys.exit(main())
|
||||
148
externals/libyuv/tools_libyuv/autoroller/unittests/roll_deps_test.py
vendored
Normal file
148
externals/libyuv/tools_libyuv/autoroller/unittests/roll_deps_test.py
vendored
Normal file
@ -0,0 +1,148 @@
|
||||
#!/usr/bin/env vpython3
|
||||
|
||||
# Copyright 2017 The LibYuv Project Authors. All rights reserved.
|
||||
#
|
||||
# Use of this source code is governed by a BSD-style license
|
||||
# that can be found in the LICENSE file in the root of the source
|
||||
# tree. An additional intellectual property rights grant can be found
|
||||
# in the file PATENTS. All contributing project authors may
|
||||
# be found in the AUTHORS file in the root of the source tree.
|
||||
|
||||
import glob
|
||||
import os
|
||||
import shutil
|
||||
import sys
|
||||
import tempfile
|
||||
import unittest
|
||||
|
||||
import roll_deps
|
||||
from roll_deps import CalculateChangedDeps, GetMatchingDepsEntries, \
|
||||
ParseDepsDict, ParseLocalDepsFile, UpdateDepsFile
|
||||
|
||||
SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
|
||||
PARENT_DIR = os.path.join(SCRIPT_DIR, os.pardir)
|
||||
sys.path.append(PARENT_DIR)
|
||||
|
||||
TEST_DATA_VARS = {
|
||||
'chromium_git': 'https://chromium.googlesource.com',
|
||||
'chromium_revision': '1b9c098a08e40114e44b6c1ec33ddf95c40b901d',
|
||||
}
|
||||
|
||||
DEPS_ENTRIES = {
|
||||
'src/build': 'https://build.com',
|
||||
'src/buildtools': 'https://buildtools.com',
|
||||
'src/testing/gtest': 'https://gtest.com',
|
||||
'src/testing/gmock': 'https://gmock.com',
|
||||
}
|
||||
|
||||
BUILD_OLD_REV = '52f7afeca991d96d68cf0507e20dbdd5b845691f'
|
||||
BUILD_NEW_REV = 'HEAD'
|
||||
BUILDTOOLS_OLD_REV = '64e38f0cebdde27aa0cfb405f330063582f9ac76'
|
||||
BUILDTOOLS_NEW_REV = '55ad626b08ef971fd82a62b7abb325359542952b'
|
||||
|
||||
|
||||
class TestError(Exception):
|
||||
pass
|
||||
|
||||
|
||||
class FakeCmd():
|
||||
def __init__(self):
|
||||
self.expectations = []
|
||||
|
||||
def add_expectation(self, *args, **kwargs):
|
||||
returns = kwargs.pop('_returns', None)
|
||||
self.expectations.append((args, kwargs, returns))
|
||||
|
||||
def __call__(self, *args, **kwargs):
|
||||
if not self.expectations:
|
||||
raise TestError('Got unexpected\n%s\n%s' % (args, kwargs))
|
||||
exp_args, exp_kwargs, exp_returns = self.expectations.pop(0)
|
||||
if args != exp_args or kwargs != exp_kwargs:
|
||||
message = 'Expected:\n args: %s\n kwargs: %s\n' % (exp_args, exp_kwargs)
|
||||
message += 'Got:\n args: %s\n kwargs: %s\n' % (args, kwargs)
|
||||
raise TestError(message)
|
||||
return exp_returns
|
||||
|
||||
|
||||
class TestRollChromiumRevision(unittest.TestCase):
|
||||
def setUp(self):
|
||||
self._output_dir = tempfile.mkdtemp()
|
||||
for test_file in glob.glob(os.path.join(SCRIPT_DIR, 'testdata', '*')):
|
||||
shutil.copy(test_file, self._output_dir)
|
||||
self._libyuv_depsfile = os.path.join(self._output_dir, 'DEPS')
|
||||
self._old_cr_depsfile = os.path.join(self._output_dir, 'DEPS.chromium.old')
|
||||
self._new_cr_depsfile = os.path.join(self._output_dir, 'DEPS.chromium.new')
|
||||
|
||||
self.fake = FakeCmd()
|
||||
self.old_RunCommand = getattr(roll_deps, '_RunCommand')
|
||||
setattr(roll_deps, '_RunCommand', self.fake)
|
||||
|
||||
def tearDown(self):
|
||||
shutil.rmtree(self._output_dir, ignore_errors=True)
|
||||
self.assertEqual(self.fake.expectations, [])
|
||||
setattr(roll_deps, '_RunCommand', self.old_RunCommand)
|
||||
|
||||
def testVarLookup(self):
|
||||
local_scope = {'foo': 'wrong', 'vars': {'foo': 'bar'}}
|
||||
lookup = roll_deps.VarLookup(local_scope)
|
||||
self.assertEqual(lookup('foo'), 'bar')
|
||||
|
||||
def testUpdateDepsFile(self):
|
||||
new_rev = 'aaaaabbbbbcccccdddddeeeeefffff0000011111'
|
||||
|
||||
current_rev = TEST_DATA_VARS['chromium_revision']
|
||||
UpdateDepsFile(self._libyuv_depsfile, current_rev, new_rev, [])
|
||||
with open(self._libyuv_depsfile, 'r') as deps_file:
|
||||
deps_contents = deps_file.read()
|
||||
self.assertTrue(new_rev in deps_contents,
|
||||
'Failed to find %s in\n%s' % (new_rev, deps_contents))
|
||||
|
||||
def testParseDepsDict(self):
|
||||
with open(self._libyuv_depsfile, 'r') as deps_file:
|
||||
deps_contents = deps_file.read()
|
||||
local_scope = ParseDepsDict(deps_contents)
|
||||
vars_dict = local_scope['vars']
|
||||
|
||||
def assertVar(variable_name):
|
||||
self.assertEqual(vars_dict[variable_name], TEST_DATA_VARS[variable_name])
|
||||
assertVar('chromium_git')
|
||||
assertVar('chromium_revision')
|
||||
self.assertEqual(len(local_scope['deps']), 3)
|
||||
|
||||
def testGetMatchingDepsEntriesReturnsPathInSimpleCase(self):
|
||||
entries = GetMatchingDepsEntries(DEPS_ENTRIES, 'src/testing/gtest')
|
||||
self.assertEqual(len(entries), 1)
|
||||
self.assertEqual(entries[0], DEPS_ENTRIES['src/testing/gtest'])
|
||||
|
||||
def testGetMatchingDepsEntriesHandlesSimilarStartingPaths(self):
|
||||
entries = GetMatchingDepsEntries(DEPS_ENTRIES, 'src/testing')
|
||||
self.assertEqual(len(entries), 2)
|
||||
|
||||
def testGetMatchingDepsEntriesHandlesTwoPathsWithIdenticalFirstParts(self):
|
||||
entries = GetMatchingDepsEntries(DEPS_ENTRIES, 'src/build')
|
||||
self.assertEqual(len(entries), 1)
|
||||
self.assertEqual(entries[0], DEPS_ENTRIES['src/build'])
|
||||
|
||||
def testCalculateChangedDeps(self):
|
||||
_SetupGitLsRemoteCall(self.fake,
|
||||
'https://chromium.googlesource.com/chromium/src/build', BUILD_NEW_REV)
|
||||
libyuv_deps = ParseLocalDepsFile(self._libyuv_depsfile)
|
||||
new_cr_deps = ParseLocalDepsFile(self._new_cr_depsfile)
|
||||
changed_deps = CalculateChangedDeps(libyuv_deps, new_cr_deps)
|
||||
self.assertEqual(len(changed_deps), 2)
|
||||
self.assertEqual(changed_deps[0].path, 'src/build')
|
||||
self.assertEqual(changed_deps[0].current_rev, BUILD_OLD_REV)
|
||||
self.assertEqual(changed_deps[0].new_rev, BUILD_NEW_REV)
|
||||
|
||||
self.assertEqual(changed_deps[1].path, 'src/buildtools')
|
||||
self.assertEqual(changed_deps[1].current_rev, BUILDTOOLS_OLD_REV)
|
||||
self.assertEqual(changed_deps[1].new_rev, BUILDTOOLS_NEW_REV)
|
||||
|
||||
|
||||
def _SetupGitLsRemoteCall(cmd_fake, url, revision):
|
||||
cmd = ['git', 'ls-remote', url, revision]
|
||||
cmd_fake.add_expectation(cmd, _returns=(revision, None))
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
21
externals/libyuv/tools_libyuv/autoroller/unittests/testdata/DEPS
vendored
Normal file
21
externals/libyuv/tools_libyuv/autoroller/unittests/testdata/DEPS
vendored
Normal file
@ -0,0 +1,21 @@
|
||||
# DEPS file for unit tests.
|
||||
|
||||
vars = {
|
||||
'chromium_git': 'https://chromium.googlesource.com',
|
||||
'chromium_revision': '1b9c098a08e40114e44b6c1ec33ddf95c40b901d',
|
||||
'ignored_str': Str(''),
|
||||
}
|
||||
|
||||
deps = {
|
||||
# Entry that is a directory in Chromium, so we're using a Git subtree mirror for it.
|
||||
'src/build':
|
||||
Var('chromium_git') + '/chromium/src/build' + '@' + '52f7afeca991d96d68cf0507e20dbdd5b845691f',
|
||||
|
||||
# Entry that's also a DEPS entry in the Chromium DEPS file.
|
||||
'src/buildtools':
|
||||
Var('chromium_git') + '/chromium/buildtools.git' + '@' + '64e38f0cebdde27aa0cfb405f330063582f9ac76',
|
||||
|
||||
# Entry only present in libyuv, not Chromium.
|
||||
'src/third_party/gflags/src':
|
||||
Var('chromium_git') + '/external/github.com/gflags/gflags@03bebcb065c83beff83d50ae025a55a4bf94dfca',
|
||||
}
|
||||
13
externals/libyuv/tools_libyuv/autoroller/unittests/testdata/DEPS.chromium.new
vendored
Normal file
13
externals/libyuv/tools_libyuv/autoroller/unittests/testdata/DEPS.chromium.new
vendored
Normal file
@ -0,0 +1,13 @@
|
||||
# DEPS file for unit tests.
|
||||
|
||||
vars = {
|
||||
'chromium_git': 'https://chromium.googlesource.com',
|
||||
|
||||
# This is updated compared to the DEPS.chromium.old file.
|
||||
'buildtools_revision': '55ad626b08ef971fd82a62b7abb325359542952b',
|
||||
}
|
||||
|
||||
deps = {
|
||||
'src/buildtools':
|
||||
Var('chromium_git') + '/chromium/buildtools.git' + '@' + Var('buildtools_revision'),
|
||||
}
|
||||
13
externals/libyuv/tools_libyuv/autoroller/unittests/testdata/DEPS.chromium.old
vendored
Normal file
13
externals/libyuv/tools_libyuv/autoroller/unittests/testdata/DEPS.chromium.old
vendored
Normal file
@ -0,0 +1,13 @@
|
||||
# DEPS file for unit tests.
|
||||
|
||||
vars = {
|
||||
'chromium_git': 'https://chromium.googlesource.com',
|
||||
|
||||
# This is and older revision than DEPS.chromium.new file.
|
||||
'buildtools_revision': '64e38f0cebdde27aa0cfb405f330063582f9ac76',
|
||||
}
|
||||
|
||||
deps = {
|
||||
'src/buildtools':
|
||||
Var('chromium_git') + '/chromium/buildtools.git' + '@' + Var('buildtools_revision'),
|
||||
}
|
||||
39
externals/libyuv/tools_libyuv/get_landmines.py
vendored
Normal file
39
externals/libyuv/tools_libyuv/get_landmines.py
vendored
Normal file
@ -0,0 +1,39 @@
|
||||
#!/usr/bin/env python3
|
||||
|
||||
# Copyright 2016 The LibYuv Project Authors. All rights reserved.
|
||||
#
|
||||
# Use of this source code is governed by a BSD-style license
|
||||
# that can be found in the LICENSE file in the root of the source
|
||||
# tree. An additional intellectual property rights grant can be found
|
||||
# in the file PATENTS. All contributing project authors may
|
||||
# be found in the AUTHORS file in the root of the source tree.
|
||||
|
||||
"""
|
||||
This file emits the list of reasons why a particular build needs to be clobbered
|
||||
(or a list of 'landmines').
|
||||
"""
|
||||
|
||||
import sys
|
||||
|
||||
|
||||
def print_landmines():
|
||||
"""
|
||||
ALL LANDMINES ARE EMITTED FROM HERE.
|
||||
"""
|
||||
# DO NOT add landmines as part of a regular CL. Landmines are a last-effort
|
||||
# bandaid fix if a CL that got landed has a build dependency bug and all bots
|
||||
# need to be cleaned up. If you're writing a new CL that causes build
|
||||
# dependency problems, fix the dependency problems instead of adding a
|
||||
# landmine.
|
||||
# See the Chromium version in src/build/get_landmines.py for usage examples.
|
||||
print('Clobber to remove GYP artifacts after switching bots to GN.')
|
||||
print('Another try to remove GYP artifacts after switching bots to GN.')
|
||||
|
||||
|
||||
def main():
|
||||
print_landmines()
|
||||
return 0
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
sys.exit(main())
|
||||
3
externals/libyuv/tools_libyuv/msan/OWNERS
vendored
Normal file
3
externals/libyuv/tools_libyuv/msan/OWNERS
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
mbonadei@chromium.org
|
||||
fbarchard@chromium.org
|
||||
pbos@chromium.org
|
||||
9
externals/libyuv/tools_libyuv/msan/blacklist.txt
vendored
Normal file
9
externals/libyuv/tools_libyuv/msan/blacklist.txt
vendored
Normal file
@ -0,0 +1,9 @@
|
||||
# The rules in this file are only applied at compile time.
|
||||
# Because the Chrome buildsystem does not automatically touch the files
|
||||
# mentioned here, changing this file requires clobbering all MSan bots.
|
||||
#
|
||||
# Please think twice before you add or remove these rules.
|
||||
|
||||
# This is a stripped down copy of Chromium's blacklist.txt, to enable
|
||||
# adding libyuv-specific blacklist entries.
|
||||
|
||||
3
externals/libyuv/tools_libyuv/ubsan/OWNERS
vendored
Normal file
3
externals/libyuv/tools_libyuv/ubsan/OWNERS
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
mbonadei@chromium.org
|
||||
fbarchard@chromium.org
|
||||
pbos@chromium.org
|
||||
15
externals/libyuv/tools_libyuv/ubsan/blacklist.txt
vendored
Normal file
15
externals/libyuv/tools_libyuv/ubsan/blacklist.txt
vendored
Normal file
@ -0,0 +1,15 @@
|
||||
#############################################################################
|
||||
# UBSan blacklist.
|
||||
# Please think twice before you add or remove these rules.
|
||||
|
||||
# This is a stripped down copy of Chromium's blacklist.txt, to enable
|
||||
# adding WebRTC-specific blacklist entries.
|
||||
|
||||
#############################################################################
|
||||
# YASM does some funny things that UBsan doesn't like.
|
||||
# https://crbug.com/489901
|
||||
src:*/third_party/yasm/*
|
||||
|
||||
#############################################################################
|
||||
# Ignore system libraries.
|
||||
src:*/usr/*
|
||||
25
externals/libyuv/tools_libyuv/ubsan/vptr_blacklist.txt
vendored
Normal file
25
externals/libyuv/tools_libyuv/ubsan/vptr_blacklist.txt
vendored
Normal file
@ -0,0 +1,25 @@
|
||||
#############################################################################
|
||||
# UBSan vptr blacklist.
|
||||
# Function and type based blacklisting use a mangled name, and it is especially
|
||||
# tricky to represent C++ types. For now, any possible changes by name manglings
|
||||
# are simply represented as wildcard expressions of regexp, and thus it might be
|
||||
# over-blacklisted.
|
||||
#
|
||||
# Please think twice before you add or remove these rules.
|
||||
#
|
||||
# This is a stripped down copy of Chromium's vptr_blacklist.txt, to enable
|
||||
# adding libyuv-specific blacklist entries.
|
||||
|
||||
#############################################################################
|
||||
# Using raw pointer values.
|
||||
#
|
||||
# A raw pointer value (16) is used to infer the field offset by
|
||||
# GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET.
|
||||
|
||||
# Example:
|
||||
# src:*/third_party/protobuf/src/google/protobuf/compiler/plugin.pb.cc
|
||||
|
||||
#############################################################################
|
||||
# UBsan goes into an infinite recursion when __dynamic_cast instrumented with
|
||||
# "vptr". See crbug.com/609786.
|
||||
src:*/third_party/libc\+\+abi/trunk/src/private_typeinfo.cpp
|
||||
Reference in New Issue
Block a user