Attachment 340524 Details for Bug 185696 – Patch

[patch] Patch

bug-185696-20180516183421.patch (text/plain), 2.68 KB, created by Leo Balter on 2018-05-16 14:34:23 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Leo Balter

Created: 2018-05-16 14:34:23 PDT

Size: 2.68 KB

patch

obsolete

>Subversion Revision: 231861
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 9a4a47e364e8620daa422778c13e5ed1477d005a..950dfde3a6dcce735f54b2326a4caca78ab1981f 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-05-16  Leo Balter  <leonardo.balter@gmail.com>
>+
>+        Test262-Runner: Adds a --timeout option
>+        https://bugs.webkit.org/show_bug.cgi?id=185696
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        The timeout option is used to set a timeout execution in ms for each test run in JSC.
>+        The passed value - if defined - will be used as the value for the JSC --watchdog arg.
>+        * Scripts/test262/Runner.pm:
>+        (processCLI):
>+        (runTest):
>+
> 2018-05-14  Yusuke Suzuki  <utatane.tea@gmail.com>
> 
>         [Win] Use C++17 in MSVC
>diff --git a/Tools/Scripts/test262/Runner.pm b/Tools/Scripts/test262/Runner.pm
>index f48cca2bf28e6f9a9a30e378410b5d5120d51d12..1d6a70249c19a42520de67f47e6fcb8cfc744720 100755
>--- a/Tools/Scripts/test262/Runner.pm
>+++ b/Tools/Scripts/test262/Runner.pm
>@@ -82,6 +82,7 @@ my $saveExpectations;
> my $failingOnly;
> my $latestImport;
> my $runningAllTests;
>+my $timeout;
> 
> my $expectationsFile = abs_path("$Bin/../../../JSTests/test262/expectations.yaml");
> my $configFile = abs_path("$Bin/../../../JSTests/test262/config.yaml");
>@@ -134,6 +135,7 @@ sub processCLI {
>         'l|latest-import' => \$latestImport,
>         'stats' => \$stats,
>         'r|results=s' => \$specifiedResultsFile,
>+        'timeout=i' => \$timeout,
>     );
> 
>     if ($help) {
>@@ -233,8 +235,9 @@ sub processCLI {
>         . "DYLD_FRAMEWORK_PATH: $DYLD_FRAMEWORK_PATH\n"
>         . "Child Processes: $max_process\n";
> 
>+    print "Test timeout: $timeout\n" if $timeout;
>     print "Features to include: " . join(', ', @features) . "\n" if @features;
>-    print "Paths:  " . join(', ', @cliTestDirs) . "\n" if @cliTestDirs;
>+    print "Paths: " . join(', ', @cliTestDirs) . "\n" if @cliTestDirs;
>     print "Config file: $configFile\n" if $config;
>     print "Expectations file: $expectationsFile\n" if $expect;
>     print "Results file: $resultsFile\n" if $stats || $failingOnly;
>@@ -598,6 +601,10 @@ sub runTest {
> 
>     my $args = '';
> 
>+    if ($timeout) {
>+        $args .= " --watchdog=$timeout ";
>+    }
>+
>     if (exists $data->{negative}) {
>         my $type = $data->{negative}->{type};
>         $args .=  " --exception=$type ";
>@@ -950,6 +957,10 @@ Calculate conformance statistics from results/results.yaml file or a supplied re
> 
> Specifies a results file for the --stats or --failing-files options.
> 
>+=item B<--timeout>
>+
>+Specifies a timeout execution in ms for each test. Defers the value to the jsc --watchdog argument. Disabled by default.
>+
> =back
> 
> =cut

Actions: View | Formatted Diff | Diff

Attachments on bug 185696: 340524