webkit/tools/layout_tests/test_expectations.txt - Issue 10963043: Fix typo from bad merge.

Side by Side Diff

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

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

Side by Side Diff: webkit/tools/layout_tests/test_expectations.txt

Issue 10963043: Fix typo from bad merge. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 3 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « no previous file | no next file » | no next file with comments »

OLD	NEW
1 <<<<<<< HEAD

2 # This file should almost always be empty. Normally Chromium test expectations	1 # This file should almost always be empty. Normally Chromium test expectations

3 # are only put here temporarily, and moved to	2 # are only put here temporarily, and moved to

4 # src/third_party/WebKit/LayoutTests/platform/chromium/TestExpectations	3 # src/third_party/WebKit/LayoutTests/platform/chromium/TestExpectations

5 # where they will remain until they are rebaselined.	4 # where they will remain until they are rebaselined.

6 #	5 #

7 #	6 #

8 # If you are landing a Chromium CL that would break webkit layout tests,	7 # If you are landing a Chromium CL that would break webkit layout tests,

9 # please follow these steps:	8 # please follow these steps:

10 #	9 #

11 # 1. Add expected failures to the bottom of this file, and run your CL through	10 # 1. Add expected failures to the bottom of this file, and run your CL through

(...skipping 17 matching lines...) Expand all Loading...
29 # Chromium, he will delete ALL expectations within this file. (By then, they	28 # Chromium, he will delete ALL expectations within this file. (By then, they

30 # will be redundant, because you already landed those same expectations in	29 # will be redundant, because you already landed those same expectations in

31 # src/third_party/WebKit/LayoutTests/platform/chromium/TestExpectations .	30 # src/third_party/WebKit/LayoutTests/platform/chromium/TestExpectations .

32 # Right?)	31 # Right?)

33 #	32 #

34 # EVERYTHING BELOW THIS LINE WILL BE DELETED AT EVERY WEBKIT DEPS ROLL	33 # EVERYTHING BELOW THIS LINE WILL BE DELETED AT EVERY WEBKIT DEPS ROLL

35	34

36 webkit.org/b/97206 http/tests/security/contentSecurityPolicy/eval-blocked-in-abo ut-blank-iframe.html [ Skip ]	35 webkit.org/b/97206 http/tests/security/contentSecurityPolicy/eval-blocked-in-abo ut-blank-iframe.html [ Skip ]

37 webkit.org/b/97206 http/tests/security/contentSecurityPolicy/function-constructo r-blocked.html [ Skip ]	36 webkit.org/b/97206 http/tests/security/contentSecurityPolicy/function-constructo r-blocked.html [ Skip ]

38 webkit.org/b/97206 http/tests/security/contentSecurityPolicy/eval-blocked.html [ Failure ]	37 webkit.org/b/97206 http/tests/security/contentSecurityPolicy/eval-blocked.html [ Failure ]

OLD	NEW