third_party/WebKit/LayoutTests/resources/testharness.js - Issue 2020083002: Import wpt@1b61dad2be6c5100beb565e91c58b8c1084b3c7d

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/LayoutTests/resources/testharness.js

Issue 2020083002: Import wpt@1b61dad2be6c5100beb565e91c58b8c1084b3c7d (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixing tests Created 4 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/LayoutTests/imported/wpt/resources/testharness.js ('k') | third_party/WebKit/Tools/Scripts/webkitpy/w3c/deps_updater.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/LayoutTests/resources/testharness.js

diff --git a/third_party/WebKit/LayoutTests/resources/testharness.js b/third_party/WebKit/LayoutTests/resources/testharness.js

index a13cacc8e2c3d20954aa4cadb9e1dab102d820e6..ceb3a4b462e4c664ade77b8a8916197dca5f6ac8 100644

--- a/third_party/WebKit/LayoutTests/resources/testharness.js

+++ b/third_party/WebKit/LayoutTests/resources/testharness.js

@@ -2466,7 +2466,9 @@ policies and contribution forms [3].

// script URL, followed by the line/col (e.g., '/resources/testharness.js:120:21').

// Escape the URL per http://stackoverflow.com/questions/3561493/is-there-a-regexp-escape-function-in-javascript

// in case it contains RegExp characters.

- var re = new RegExp((get_script_url().replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&') || "\\btestharness.js") + ":\\d+:\\d+");

+ var script_url = get_script_url();

+ var re_text = script_url ? script_url.replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&') : "\\btestharness.js";

+ var re = new RegExp(re_text + ":\\d+:\\d+");

// Some browsers include a preamble that specifies the type of the error object. Skip this by

// advancing until we find the first stack frame originating from testharness.js.