Commit 5e8b93b0 authored by Marc-Antoine Ruel's avatar Marc-Antoine Ruel Committed by Commit Bot

determinism: add .aab and .pdb to compare list; ignore ChromeModernPublic.aab

Add apks/ChromeModernPublic.aab to the known failure. This should turn
'Deterministic Android' and 'Deterministic Android (dbg)' back green.

.aab doesn't have effect at the moment, as --use-isolate-files is currently
passed in by the recipe. Add a note about eventually using gn directly.

Bug: 972075
Bug: 939984
Change-Id: Iccfbd7cc614fbfab441fa189a7d4eb0c086b97ab
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1649142
Commit-Queue: Marc-Antoine Ruel <maruel@chromium.org>
Reviewed-by: default avatarDirk Pranke <dpranke@chromium.org>
Reviewed-by: default avatarSébastien Marchand <sebmarchand@chromium.org>
Reviewed-by: default avatarErik Chen <erikchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#694736}
parent f71e79c5
......@@ -24,20 +24,31 @@ BASE_DIR = os.path.dirname(os.path.abspath(__file__))
def get_files_to_compare(build_dir, recursive=False):
"""Get the list of files to compare."""
allowed = frozenset(
('', '.apk', '.app', '.dll', '.dylib', '.exe', '.nexe', '.pdb', '.so'))
# .bin is for the V8 snapshot files natives_blob.bin, snapshot_blob.bin
non_x_ok_exts = frozenset(('.apk', '.bin', '.isolated', '.zip'))
allowed = frozenset((
'.aab',
'.apk',
'.app',
'.bin', # V8 snapshot files natives_blob.bin, snapshot_blob.bin
'.dll',
'.dylib',
'.exe',
'.isolated',
'.nexe',
'.pdb',
'.so',
'.zip',
))
def check(f):
if not os.path.isfile(f):
return False
if os.path.basename(f).startswith('.'):
return False
ext = os.path.splitext(f)[1]
if ext in non_x_ok_exts:
if ext in allowed:
return True
return ext in allowed and (ext != '' or os.access(f, os.X_OK))
# Special case for file without an extension that has the executable bit
# set.
return ext == '' and os.access(f, os.X_OK)
ret_files = set()
for root, dirs, files in os.walk(build_dir):
......@@ -50,6 +61,7 @@ def get_files_to_compare(build_dir, recursive=False):
def get_files_to_compare_using_isolate(build_dir):
# First, find all .isolate files in build_dir.
# TODO(maruel): https://crbug.com/972075 Extract targets from mb.
isolates = glob.glob(os.path.join(build_dir, '*.isolate'))
# Then, extract their contents.
......
......@@ -13,10 +13,11 @@
#
# TODO(sebmarchand): Remove this once all the files are deterministic.
{
# https://crbug.com/383340
# TODO(thakis): Move android det bots to use two distinct build dirs,
# https://crbug.com/899438
'android': [
# https://crbug.com/939984
'apks/ChromeModernPublic.aab',
],
'fuchsia': [
......
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