Attachment 342204 Details for Bug 186409 – proposed patch.

[patch] proposed patch.

bug-186409.patch (text/plain), 6.11 KB, created by Mark Lam on 2018-06-07 14:03:26 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Lam

Created: 2018-06-07 14:03:26 PDT

Size: 6.11 KB

patch

obsolete

>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 232597)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,22 @@
>+2018-06-07  Mark Lam  <mark.lam@apple.com>
>+
>+        Enhance run-jsc-stress-tests to allow a test to specify test specific options required for it to run.
>+        https://bugs.webkit.org/show_bug.cgi?id=186409
>+        <rdar://problem/40909007>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        This is needed because some tests are written with specific features in mind, and
>+        we may not necessarily want to enable that option for all tests.
>+
>+        We can now specify something like this at the top of a test file:
>+            //@ requireOptions("--useIntlPluralRules=true")
>+
>+        ... and ensure that that test will be run with the --useIntlPluralRules=true
>+        option for all test configurations that run the test.
>+
>+        * Scripts/run-jsc-stress-tests:
>+
> 2018-06-07  Tim Horton  <timothy_horton@apple.com>
> 
>         REGRESSION (r232544): [iOS] TestWebKitAPI.WebKit.OverrideLayoutSizeChangesDuringAnimatedResizeSucceed is failing
>Index: Tools/Scripts/run-jsc-stress-tests
>===================================================================
>--- Tools/Scripts/run-jsc-stress-tests	(revision 232584)
>+++ Tools/Scripts/run-jsc-stress-tests	(working copy)
>@@ -503,6 +503,7 @@ def pathToHelpers
> end
> 
> $runCommandOptions = {}
>+$testSpecificRequiredOptions = []
> 
> $uniqueFilenameCounter = 0
> def uniqueFilename(extension)
>@@ -572,8 +573,12 @@ def slow!
>     $runCommandOptions[:isSlow] = true
> end
> 
>+def requireOptions(*options)
>+    $testSpecificRequiredOptions += options
>+end
>+
> def runWithOutputHandler(kind, outputHandler, *options)
>-    addRunCommand(kind, [pathToVM.to_s] + BASE_OPTIONS + options + [$benchmark.to_s], outputHandler, simpleErrorHandler)
>+    addRunCommand(kind, [pathToVM.to_s] + BASE_OPTIONS + $testSpecificRequiredOptions + options + [$benchmark.to_s], outputHandler, simpleErrorHandler)
> end
> 
> def run(kind, *options)
>@@ -914,7 +919,7 @@ def runTest262(mode, exception, includeF
> 
>     prepareExtraRelativeFiles(includeFiles.map { |f| "../" + f }, $collection)
> 
>-    args = [pathToVM.to_s] + BASE_OPTIONS
>+    args = [pathToVM.to_s] + BASE_OPTIONS + $testSpecificRequiredOptions
>     args << "--exception=" + exception if failsWithException
>     args << "--test262-async" if isAsync
>     args += includeFiles
>@@ -956,7 +961,7 @@ def prepareTest262Fixture
> end
> 
> def runES6(mode)
>-    args = [pathToVM.to_s] + BASE_OPTIONS + [$benchmark.to_s]
>+    args = [pathToVM.to_s] + BASE_OPTIONS + $testSpecificRequiredOptions + [$benchmark.to_s]
>     case mode
>     when :normal
>         errorHandler = simpleErrorHandler
>@@ -1087,7 +1092,7 @@ def runChakra(mode, exception, baselineF
>     prepareExtraAbsoluteFiles(CHAKRATESTS_PATH, ["jsc-lib.js"])
>     prepareExtraRelativeFiles(extraFiles.map { |f| "../" + f }, $collection)
> 
>-    args = [pathToVM.to_s] + BASE_OPTIONS
>+    args = [pathToVM.to_s] + BASE_OPTIONS + $testSpecificRequiredOptions
>     args += FTL_OPTIONS if $isFTLPlatform
>     args += EAGER_OPTIONS
>     args << "--exception=" + exception if failsWithException
>@@ -1128,7 +1133,7 @@ def runLayoutTest(kind, *options)
>     prepareExtraRelativeFiles(["../#{testName}-expected.txt"], $benchmarkDirectory)
>     prepareExtraAbsoluteFiles(LAYOUTTESTS_PATH, ["resources/standalone-pre.js", "resources/standalone-post.js"])
> 
>-    args = [pathToVM.to_s] + BASE_OPTIONS + options +
>+    args = [pathToVM.to_s] + BASE_OPTIONS + $testSpecificRequiredOptions + options +
>         [(Pathname.new("resources") + "standalone-pre.js").to_s,
>          $benchmark.to_s,
>          (Pathname.new("resources") + "standalone-post.js").to_s]
>@@ -1268,7 +1273,7 @@ def runMozillaTest(kind, mode, extraFile
>         kind = "mozilla"
>     end
>     prepareExtraRelativeFiles(extraFiles.map{|v| (Pathname("..") + v).to_s}, $collection)
>-    args = [pathToVM.to_s] + BASE_OPTIONS + options + extraFiles.map{|v| v.to_s} + [$benchmark.to_s]
>+    args = [pathToVM.to_s] + BASE_OPTIONS + $testSpecificRequiredOptions + options + extraFiles.map{|v| v.to_s} + [$benchmark.to_s]
>     case mode
>     when :normal
>         errorHandler = mozillaErrorHandler
>@@ -1338,7 +1343,7 @@ def defaultRunMozillaTest(mode, *extraFi
> end
> 
> def runNoisyTestImpl(kind, options, additionalEnv)
>-    addRunCommand(kind, [pathToVM.to_s] + BASE_OPTIONS + options + [$benchmark.to_s], noisyOutputHandler, noisyErrorHandler, *additionalEnv)
>+    addRunCommand(kind, [pathToVM.to_s] + BASE_OPTIONS + $testSpecificRequiredOptions + options + [$benchmark.to_s], noisyOutputHandler, noisyErrorHandler, *additionalEnv)
> end
> 
> def runNoisyTest(kind, *options)
>@@ -1536,6 +1541,7 @@ def handleCollectionDirectory(collection
>             $benchmark = path.basename
>             
>             $runCommandOptions = {}
>+            $testSpecificRequiredOptions = []
>             defaultRun unless parseRunCommands
>         }
>     }
>Index: LayoutTests/ChangeLog
>===================================================================
>--- LayoutTests/ChangeLog	(revision 232584)
>+++ LayoutTests/ChangeLog	(working copy)
>@@ -1,3 +1,13 @@
>+2018-06-07  Mark Lam  <mark.lam@apple.com>
>+
>+        Enhance run-jsc-stress-tests to allow a test to specify test specific options required for it to run.
>+        https://bugs.webkit.org/show_bug.cgi?id=186409
>+        <rdar://problem/40909007>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * js/script-tests/intl-pluralrules.js:
>+
> 2018-06-07  Brent Fulgham  <bfulgham@apple.com>
> 
>         Handle Storage Access API calls in the absence of an attached frame
>Index: LayoutTests/js/script-tests/intl-pluralrules.js
>===================================================================
>--- LayoutTests/js/script-tests/intl-pluralrules.js	(revision 232584)
>+++ LayoutTests/js/script-tests/intl-pluralrules.js	(working copy)
>@@ -1,4 +1,6 @@
> //@ skip if $hostOS == "windows" or $hostOS == "linux"
>+//@ requireOptions("--useIntlPluralRules=true")
>+
> description("This test checks the behavior of Intl.PluralRules as described in the ECMAScript Internationalization API Specification.");
> 
> // https://tc39.github.io/ecma402/#pluralrules-objects

Actions: View | Formatted Diff | Diff

Attachments on bug 186409: 342204