From 7ba037592da1dd338efc8ebc6c84dd6ea4613734 Mon Sep 17 00:00:00 2001 From: Franziska Hinkelmann Date: Wed, 8 Nov 2017 20:09:54 +0100 Subject: [PATCH] deps: cherry-pick cc55747 from V8 upstream MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes the flaky message/console test on our CI. Original commit message: [test/message] Allow numbers to have more than one leading digit. The {NUMBER} regexp only allowed one, leading to occasional test failures such as: https://build.chromium.org/p/client.v8/builders/V8%20Mac%20-%20debug/builds/17156 Bug: Change-Id: I25a08b80640d9af19ba70c61c846163685f1cb82 Reviewed-on: https://chromium-review.googlesource.com/753322 Reviewed-by: Franziska Hinkelmann Commit-Queue: Georg Neis Cr-Commit-Position: refs/heads/master@{#49109} PR-URL: https://github.com/nodejs/node/pull/16890 Ref: https://github.com/nodejs/build/issues/936 Reviewed-By: Colin Ihrig Reviewed-By: Michaël Zasso Reviewed-By: Daniel Bevenius Reviewed-By: James M Snell --- deps/v8/include/v8-version.h | 2 +- deps/v8/test/message/testcfg.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deps/v8/include/v8-version.h b/deps/v8/include/v8-version.h index d3c3a2b76c13ff..f7395e3d6f3c9c 100644 --- a/deps/v8/include/v8-version.h +++ b/deps/v8/include/v8-version.h @@ -11,7 +11,7 @@ #define V8_MAJOR_VERSION 6 #define V8_MINOR_VERSION 1 #define V8_BUILD_NUMBER 534 -#define V8_PATCH_LEVEL 47 +#define V8_PATCH_LEVEL 48 // Use 1 for candidates and 0 otherwise. // (Boolean macro values are not supported by all preprocessors.) diff --git a/deps/v8/test/message/testcfg.py b/deps/v8/test/message/testcfg.py index 0576458af24a4e..1bbb2b16d83472 100644 --- a/deps/v8/test/message/testcfg.py +++ b/deps/v8/test/message/testcfg.py @@ -107,7 +107,7 @@ def IsFailureOutput(self, testcase): expected_lines, actual_lines, fillvalue=''): pattern = re.escape(expected.rstrip() % env) pattern = pattern.replace("\\*", ".*") - pattern = pattern.replace("\\{NUMBER\\}", "\d(?:\.\d*)?") + pattern = pattern.replace("\\{NUMBER\\}", "\d+(?:\.\d*)?") pattern = "^%s$" % pattern if not re.match(pattern, actual): return True