Attachment 340350 Details for Bug 185622 – Patch

[patch] Patch

bug-185622-20180514174011.patch (text/plain), 5.04 KB, created by Leo Balter on 2018-05-14 13:40:12 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Leo Balter

Created: 2018-05-14 13:40:12 PDT

Size: 5.04 KB

patch

obsolete

>Subversion Revision: 231767
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 2d5b861428cedc18f6a928735fc2e521cbedd545..fd367d62a704bc471ed29b2a1e178e2bf1387dd9 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,18 @@
>+2018-05-14  Leo Balter  <leonardo.balter@gmail.com>
>+
>+        Test262-Runner: Fix RegExp for capturing tests metadata"
>+        https://bugs.webkit.org/show_bug.cgi?id=185622
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        This patch fixes the RegExp used to capture each test metadata regarding their EOL characters for
>+        both LF and CRLF forms.
>+
>+        The fix also allows the runner to capture the proper results from two specific files using CR and
>+        CRLF line terminators. They are updated in the expectations file.
>+        * Scripts/test262/Runner.pm:
>+        (parseData):
>+
> 2018-05-14  Jeremy Jones  <jeremyj@apple.com>
> 
>         NSEvent event trackers don't work from WebKitTestRunner
>diff --git a/Tools/Scripts/test262/Runner.pm b/Tools/Scripts/test262/Runner.pm
>index 523e006883b4c3a5c2b14c859274936e17237bd5..71f12502d0e47b66ca9c3bd552d2b33a81b8b99e 100755
>--- a/Tools/Scripts/test262/Runner.pm
>+++ b/Tools/Scripts/test262/Runner.pm
>@@ -707,7 +707,7 @@ sub parseData {
> 
>     my $parsed;
>     my $found = '';
>-    if ($contents =~ /\/\*(---\n[\S\s]*)\n---\*\//m) {
>+    if ($contents =~ /\/\*(---[\r\n]+[\S\s]*)[\r\n]+---\*\//m) {
>         $found = $1;
>     };
> 
>@@ -718,6 +718,7 @@ sub parseData {
>         print "\nError parsing YAML data on file $filename.\n";
>         print "$@\n";
>     };
>+
>     return $parsed;
> }
> 
>diff --git a/JSTests/test262/expectations.yaml b/JSTests/test262/expectations.yaml
>index 24b95f693fe0b87127016de59add98c0c4e96ebb..ee0b3801600a254346402a1620e8878091611272 100644
>--- a/JSTests/test262/expectations.yaml
>+++ b/JSTests/test262/expectations.yaml
>@@ -1099,11 +1099,11 @@ test/built-ins/Function/prototype/toString/getter-object.js:
>   default: "Test262Error: Conforms to NativeFunction Syntax: 'function ( /* c */ ) /* d */ { /* e */ }'.(get /* a */ f /* b */ ( /* c */ ) /* d */ { /* e */ })"
>   strict mode: "Test262Error: Conforms to NativeFunction Syntax: 'function ( /* c */ ) /* d */ { /* e */ }'.(get /* a */ f /* b */ ( /* c */ ) /* d */ { /* e */ })"
> test/built-ins/Function/prototype/toString/line-terminator-normalisation-CR-LF.js:
>-  default: "ReferenceError: Can't find variable: assertToStringOrNativeFunction"
>-  strict mode: "ReferenceError: Can't find variable: assertToStringOrNativeFunction"
>+  default: "Test262Error: Conforms to NativeFunction Syntax: 'function f(\r"
>+  strict mode: "Test262Error: Conforms to NativeFunction Syntax: 'function f(\r"
> test/built-ins/Function/prototype/toString/line-terminator-normalisation-CR.js:
>-  default: "ReferenceError: Can't find variable: assertToStringOrNativeFunction"
>-  strict mode: "ReferenceError: Can't find variable: assertToStringOrNativeFunction"
>+  default: "Test262Error: Conforms to NativeFunction Syntax: 'function f(\r// c\rx\r// d\r,\r// e\ry\r// f\r)\r// g\r{\r// h\r;\r// i\r;\r// j\r}'.(function\r// a\rf\r// b\r(\r// c\rx\r// d\r,\r// e\ry\r// f\r)\r// g\r{\r// h\r;\r// i\r;\r// j\r})"
>+  strict mode: "Test262Error: Conforms to NativeFunction Syntax: 'function f(\r// c\rx\r// d\r,\r// e\ry\r// f\r)\r// g\r{\r// h\r;\r// i\r;\r// j\r}'.(function\r// a\rf\r// b\r(\r// c\rx\r// d\r,\r// e\ry\r// f\r)\r// g\r{\r// h\r;\r// i\r;\r// j\r})"
> test/built-ins/Function/prototype/toString/line-terminator-normalisation-LF.js:
>   default: "Test262Error: Conforms to NativeFunction Syntax: 'function f("
>   strict mode: "Test262Error: Conforms to NativeFunction Syntax: 'function f("
>@@ -2197,14 +2197,6 @@ test/language/eval-code/indirect/var-env-func-init-global-update-configurable.js
> test/language/eval-code/indirect/var-env-global-lex-non-strict.js:
>   default: 'Test262Error: Expected SameValue(ÃÂ«function TypeError() {'
>   strict mode: 'Test262Error: Expected SameValue(ÃÂ«function TypeError() {'
>-test/language/expressions/arrow-function/arrow/binding-tests-1.js:
>-  strict mode: 'Test262Error: This binding initialization was incorrect for arrow capturing this from closure. Expected SameValue(ÃÂ«undefinedÃÂ», ÃÂ«[object global]ÃÂ») to be true'
>-test/language/expressions/arrow-function/arrow/binding-tests-2.js:
>-  strict mode: 'Test262Error: This binding initialization was incorrect for arrow capturing this from closure. Expected SameValue(ÃÂ«undefinedÃÂ», ÃÂ«[object global]ÃÂ») to be true'
>-test/language/expressions/arrow-function/arrow/binding-tests-3.js:
>-  strict mode: 'Test262Error: This binding initialization was incorrect for arrow capturing this from closure. Expected SameValue(ÃÂ«undefinedÃÂ», ÃÂ«[object global]ÃÂ») to be true'
>-test/language/expressions/arrow-function/arrow/capturing-closure-variables-2.js:
>-  strict mode: "SyntaxError: 'with' statements are not valid in strict mode."
> test/language/expressions/arrow-function/scope-body-lex-distinct.js:
>   default: 'Test262Error: Expected a SyntaxError to be thrown but no exception was thrown at all'
> test/language/expressions/arrow-function/scope-param-elem-var-close.js:

Actions: View | Formatted Diff | Diff

Attachments on bug 185622: 340344 | 340350