summaryrefslogtreecommitdiff
path: root/chromium/infra
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2017-07-12 14:07:37 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2017-07-17 10:29:26 +0000
commitec02ee4181c49b61fce1c8fb99292dbb8139cc90 (patch)
tree25cde714b2b71eb639d1cd53f5a22e9ba76e14ef /chromium/infra
parentbb09965444b5bb20b096a291445170876225268d (diff)
downloadqtwebengine-chromium-ec02ee4181c49b61fce1c8fb99292dbb8139cc90.tar.gz
BASELINE: Update Chromium to 59.0.3071.134
Change-Id: Id02ef6fb2204c5fd21668a1c3e6911c83b17585a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/infra')
-rw-r--r--chromium/infra/config/cq.cfg12
-rwxr-xr-xchromium/infra/scripts/legacy/scripts/slave/chromium/sizes.py11
2 files changed, 22 insertions, 1 deletions
diff --git a/chromium/infra/config/cq.cfg b/chromium/infra/config/cq.cfg
index 7cfb95a6257..903732636d2 100644
--- a/chromium/infra/config/cq.cfg
+++ b/chromium/infra/config/cq.cfg
@@ -34,9 +34,19 @@ verifiers {
try_job {
buckets {
name: "luci.chromium.try"
+ # Builders in this bucket are defined in
+ # https://chromium.googlesource.com/chromium/src/+/infra/config/cr-buildbucket.cfg
builders {
name: "LUCI linux_chromium_rel_ng"
- experiment_percentage: 1
+ experiment_percentage: 5
+ }
+ builders {
+ name: "LUCI mac_chromium_rel_ng"
+ experiment_percentage: 5
+ }
+ builders {
+ name: "LUCI win_chromium_rel_ng"
+ experiment_percentage: 5
}
}
buckets {
diff --git a/chromium/infra/scripts/legacy/scripts/slave/chromium/sizes.py b/chromium/infra/scripts/legacy/scripts/slave/chromium/sizes.py
index d5a1169d731..df09b7cac32 100755
--- a/chromium/infra/scripts/legacy/scripts/slave/chromium/sizes.py
+++ b/chromium/infra/scripts/legacy/scripts/slave/chromium/sizes.py
@@ -299,6 +299,17 @@ def check_linux_binary(target_dir, binary_name, options):
if has_init_array:
si_count = init_array_size / word_size
si_count = max(si_count, 0)
+
+ # In newer versions of gcc crtbegin.o inserts frame_dummy into .init_array
+ # but we don't want to count this entry, since it alwasy present and nothing
+ # to do with our code.
+ # TODO(sbc): Do this unconditionally once we drop support for wheezy (gcc-4.6
+ # version of crtbegin.o)
+ result, stdout = run_process(result, ['nm', binary_file])
+ if '__frame_dummy_init_array_entry' in stdout:
+ assert(si_count > 0)
+ si_count -= 1
+
sizes.append((binary_name + '-si', 'initializers', '', si_count, 'files'))
# For Release builds only, use dump-static-initializers.py to print the list