BASELINE: Update Chromium to 56.0.2924.122

Change-Id: I4e04de8f47e47e501c46ed934c76a431c6337ced
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

2 files changed, 35 insertions, 35 deletions

diff --git a/chromium/v8/tools/sanitizers/sancov_merger.py b/chromium/v8/tools/sanitizers/sancov_merger.py
index a4cfec1b0c4..867f8b42582 100755
--- a/chromium/v8/tools/sanitizers/sancov_merger.py
+++ b/chromium/v8/tools/sanitizers/sancov_merger.py
@@ -7,7 +7,7 @@
 
 When merging test runner output, the sancov files are expected
 to be located in one directory with the file-name pattern:
-<executable name>.test.<id>.sancov
+<executable name>.test.<id>.<attempt>.sancov
 
 For each executable, this script writes a new file:
 <executable name>.result.sancov
@@ -48,7 +48,7 @@ CPUS = cpu_count()
 
 # Regexp to find sancov file as output by the v8 test runner. Also grabs the
 # executable name in group 1.
-SANCOV_FILE_RE = re.compile(r'^(.*)\.test\.\d+\.sancov$')
+SANCOV_FILE_RE = re.compile(r'^(.*)\.test\.\d+\.\d+\.sancov$')
 
 # Regexp to find sancov result files as returned from swarming.
 SANCOV_RESULTS_FILE_RE = re.compile(r'^.*\.result\.sancov$')
diff --git a/chromium/v8/tools/sanitizers/sancov_merger_test.py b/chromium/v8/tools/sanitizers/sancov_merger_test.py
index 93b89eb8a7b..899c716a5a4 100644
--- a/chromium/v8/tools/sanitizers/sancov_merger_test.py
+++ b/chromium/v8/tools/sanitizers/sancov_merger_test.py
@@ -11,19 +11,19 @@ import sancov_merger
 # executable name -> file list.
 FILE_MAP = {
   'd8': [
-    'd8.test.1.sancov',
-    'd8.test.2.sancov',
-    'd8.test.3.sancov',
-    'd8.test.4.sancov',
-    'd8.test.5.sancov',
-    'd8.test.6.sancov',
-    'd8.test.7.sancov',
+    'd8.test.1.1.sancov',
+    'd8.test.2.1.sancov',
+    'd8.test.3.1.sancov',
+    'd8.test.4.1.sancov',
+    'd8.test.5.1.sancov',
+    'd8.test.5.2.sancov',
+    'd8.test.6.1.sancov',
   ],
   'cctest': [
-    'cctest.test.1.sancov',
-    'cctest.test.2.sancov',
-    'cctest.test.3.sancov',
-    'cctest.test.4.sancov',
+    'cctest.test.1.1.sancov',
+    'cctest.test.2.1.sancov',
+    'cctest.test.3.1.sancov',
+    'cctest.test.4.1.sancov',
   ],
 }
 
@@ -32,42 +32,42 @@ FILE_MAP = {
 # (flag, path, executable name, intermediate result index, file list).
 EXPECTED_INPUTS_2 = [
   (False, '/some/path', 'cctest', 0, [
-    'cctest.test.1.sancov',
-    'cctest.test.2.sancov']),
+    'cctest.test.1.1.sancov',
+    'cctest.test.2.1.sancov']),
   (False, '/some/path', 'cctest', 1, [
-    'cctest.test.3.sancov',
-    'cctest.test.4.sancov']),
+    'cctest.test.3.1.sancov',
+    'cctest.test.4.1.sancov']),
   (False, '/some/path', 'd8', 0, [
-    'd8.test.1.sancov',
-    'd8.test.2.sancov',
-    'd8.test.3.sancov',
-    'd8.test.4.sancov']),
+    'd8.test.1.1.sancov',
+    'd8.test.2.1.sancov',
+    'd8.test.3.1.sancov',
+    'd8.test.4.1.sancov']),
   (False, '/some/path', 'd8', 1, [
-    'd8.test.5.sancov',
-    'd8.test.6.sancov',
-    'd8.test.7.sancov']),
+    'd8.test.5.1.sancov',
+    'd8.test.5.2.sancov',
+    'd8.test.6.1.sancov']),
 ]
 
 
 # The same for 4 cpus.
 EXPECTED_INPUTS_4 = [
   (True, '/some/path', 'cctest', 0, [
-    'cctest.test.1.sancov',
-    'cctest.test.2.sancov']),
+    'cctest.test.1.1.sancov',
+    'cctest.test.2.1.sancov']),
   (True, '/some/path', 'cctest', 1, [
-    'cctest.test.3.sancov',
-    'cctest.test.4.sancov']),
+    'cctest.test.3.1.sancov',
+    'cctest.test.4.1.sancov']),
   (True, '/some/path', 'd8', 0, [
-    'd8.test.1.sancov',
-    'd8.test.2.sancov']),
+    'd8.test.1.1.sancov',
+    'd8.test.2.1.sancov']),
   (True, '/some/path', 'd8', 1, [
-    'd8.test.3.sancov',
-    'd8.test.4.sancov']),
+    'd8.test.3.1.sancov',
+    'd8.test.4.1.sancov']),
   (True, '/some/path', 'd8', 2, [
-    'd8.test.5.sancov',
-    'd8.test.6.sancov']),
+    'd8.test.5.1.sancov',
+    'd8.test.5.2.sancov']),
   (True, '/some/path', 'd8', 3, [
-    'd8.test.7.sancov'])]
+    'd8.test.6.1.sancov'])]
 
 
 class MergerTests(unittest.TestCase):