From e733310db58160074f574c429d48f8308c0afe17 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 8 Mar 2017 10:28:10 +0100 Subject: BASELINE: Update Chromium to 56.0.2924.122 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I4e04de8f47e47e501c46ed934c76a431c6337ced Reviewed-by: Michael Brüning --- chromium/v8/tools/testrunner/local/execution.py | 10 +++++++--- chromium/v8/tools/testrunner/testrunner.isolate | 7 +++++++ 2 files changed, 14 insertions(+), 3 deletions(-) (limited to 'chromium/v8/tools/testrunner') diff --git a/chromium/v8/tools/testrunner/local/execution.py b/chromium/v8/tools/testrunner/local/execution.py index f3d11a8b5cf..4cb9e45a035 100644 --- a/chromium/v8/tools/testrunner/local/execution.py +++ b/chromium/v8/tools/testrunner/local/execution.py @@ -149,8 +149,9 @@ class TestJob(Job): Rename files with PIDs to files with unique test IDs, because the number of tests might be higher than pid_max. E.g.: - d8.1234.sancov -> d8.test.1.sancov, where 1234 was the process' PID - and 1 is the test ID. + d8.1234.sancov -> d8.test.42.1.sancov, where 1234 was the process' PID, + 42 is the test ID and 1 is the attempt (the same test might be rerun on + failures). """ if context.sancov_dir and output.pid is not None: sancov_file = os.path.join( @@ -160,7 +161,10 @@ class TestJob(Job): if os.path.exists(sancov_file): parts = sancov_file.split(".") new_sancov_file = ".".join( - parts[:-2] + ["test", str(self.test.id)] + parts[-1:]) + parts[:-2] + + ["test", str(self.test.id), str(self.test.run)] + + parts[-1:] + ) assert not os.path.exists(new_sancov_file) os.rename(sancov_file, new_sancov_file) diff --git a/chromium/v8/tools/testrunner/testrunner.isolate b/chromium/v8/tools/testrunner/testrunner.isolate index 1e8e9dccb99..533ef68c8fe 100644 --- a/chromium/v8/tools/testrunner/testrunner.isolate +++ b/chromium/v8/tools/testrunner/testrunner.isolate @@ -20,5 +20,12 @@ ], }, }], + ['is_gn==1', { + 'variables': { + 'files': [ + '<(PRODUCT_DIR)/v8_build_config.json', + ], + }, + }], ], } -- cgit v1.2.1