Changeset 121394 in webkit for trunk/Source/JavaScriptCore

Timestamp:

Jun 27, 2012, 6:14:20 PM (13 years ago)

Author:

[email protected]

Message:

[Win] jscore-tests flakey
​https://bugs.webkit.org/show_bug.cgi?id=88118

Reviewed by Jessie Berlin.

jsDriver.pl on windows intermittently doesn't get the returned value from jsc,
instead it gets 126. Added a new option to jsc (-x) which prints the exit
code before exiting. jsDriver.pl uses this option on Windows and parses the
exit code output for the exit code, removing it before comparing the actual
and expected outputs. Filed a follow on "FIXME" defect:
[WIN] Intermittent failure for jsc return value to propagate through jsDriver.pl
​https://bugs.webkit.org/show_bug.cgi?id=90119

• jsc.cpp:

(CommandLine::CommandLine):
(CommandLine):
(printUsageStatement):
(parseArguments):
(jscmain):

• tests/mozilla/jsDriver.pl:

(execute_tests):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• jsc.cpp (modified) (6 diffs)
• tests/mozilla/jsDriver.pl (modified) (3 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2012-06-27  Michael Saboff  <[email protected]>
+
+        [Win] jscore-tests flakey
+        https://bugs.webkit.org/show_bug.cgi?id=88118
+
+        Reviewed by Jessie Berlin.
+
+        jsDriver.pl on windows intermittently doesn't get the returned value from jsc,
+        instead it gets 126.  Added a new option to jsc (-x) which prints the exit
+        code before exiting.  jsDriver.pl uses this option on Windows and parses the
+        exit code output for the exit code, removing it before comparing the actual
+        and expected outputs.  Filed a follow on "FIXME" defect:
+        [WIN] Intermittent failure for jsc return value to propagate through jsDriver.pl
+        https://bugs.webkit.org/show_bug.cgi?id=90119
+
+        * jsc.cpp:
+        (CommandLine::CommandLine):
+        (CommandLine):
+        (printUsageStatement):
+        (parseArguments):
+        (jscmain):
+        * tests/mozilla/jsDriver.pl:
+        (execute_tests):
+
 2012-06-27  Sheriff Bot  <[email protected]>
 

trunk/Source/JavaScriptCore/jsc.cpp

@@ -118 +118 @@
         : interactive(false)
         , dump(false)
+        , exitCode(false)
     {
     }
@@ -123 +124 @@
     bool interactive;
     bool dump;
+    bool exitCode;
     Vector<Script> scripts;
     Vector<UString> arguments;
@@ -612 +614 @@
     fprintf(stderr, "  -s         Installs signal handlers that exit on a crash (Unix platforms only)\n");
 #endif
+    fprintf(stderr, "  -x         Output exit code before terminating\n");
 
     exit(help ? EXIT_SUCCESS : EXIT_FAILURE);
@@ -650 +653 @@
             continue;
         }
+        if (!strcmp(arg, "-x")) {
+            options.exitCode = true;
+            continue;
+        }
         if (!strcmp(arg, "--")) {
             ++i;
@@ -668 +675 @@
 int jscmain(int argc, char** argv)
 {
-    
     RefPtr<JSGlobalData> globalData = JSGlobalData::create(ThreadStackTypeLarge, LargeHeap);
     JSLockHolder lock(globalData.get());
+    int result;
 
     CommandLine options;
@@ -680 +687 @@
         runInteractive(globalObject);
 
-    return success ? 0 : 3;
+    result = success ? 0 : 3;
+
+    if (options.exitCode)
+        printf("jsc exiting %d\n", result);
+
+    return result;
 }
 

trunk/Source/JavaScriptCore/tests/mozilla/jsDriver.pl

@@ -165 +165 @@
         my $bug_number;
         my $status_lines;
+        my @jsc_exit_code;
         
 # user selected [Q]uit from ^C handler.
@@ -178 +179 @@
             
             $shell_command .= &xp_path($engine_command)  . " -s ";
-            
+
+# FIXME: <https://bugs.webkit.org/show_bug.cgi?id=90119>
+# Sporadically on Windows, the exit code returned after close() in $?
+# is 126 (after the appropraite shifting, even though jsc exits with
+# 0 or 3). To work around this, a -x option was added to jsc that will
+# output the exit value right before exiting.  We parse that value and
+# remove it from the output stream before comparing the actual and expected
+# outputs. When that bug is found and fixed, the code for processing of
+# "jsc exiting [\d]" and use of @jsc_exit_code can be removed along with
+# the -x option in jsc.cpp
+            if ($os_type eq "WIN") {
+                $shell_command .= " -x ";
+            }
+
             $path = &xp_path($opt_suite_path . $suite . "/shell.js");
             if (-f $path) {
@@ -203 +217 @@
         @output = <OUTPUT>;
         close (OUTPUT);
-        
-        @output = grep (!/js\>/, @output);
-        
-        if ($opt_exit_munge == 1) {
+
+        @jsc_exit_code = grep (/jsc exiting [\d]/, @output);
+        @output = grep (!/js\>|jsc exiting [\d]/, @output);
+
+        if (($#jsc_exit_code == 0) && ($jsc_exit_code[0] =~ /jsc exiting ([\d])\W*/)) {
+# return value from jsc output to work around windows bug
+            $got_exit = $1;
+            if ($opt_exit_munge == 1) {
+                $exit_signal = ($? & 255);
+            } else {
+                $exit_signal = 0;
+            }
+        } elsif ($opt_exit_munge == 1) {
 # signal information in the lower 8 bits, exit code above that
             $got_exit = ($? >> 8);