Changeset 130223 in webkit

Timestamp:

Oct 2, 2012 3:59:08 PM (12 years ago)

Author:

roger_fong@apple.com

Message:

executive_unittest.py fails on Apple Windows bots but not when run locally.
​https://bugs.webkit.org/show_bug.cgi?id=98196

Reviewed by Eric Seidel.

Making the test more flexible to check for cygwin and allow different outputs from process.wait().

• Scripts/webkitpy/common/system/executive_unittest.py:

(ExecutiveTest.serial_test_kill_process):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/system/executive_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-10-02  Roger Fong  <roger_fong@apple.com>
+
+        executive_unittest.py fails on Apple Windows bots but not when run locally.
+        https://bugs.webkit.org/show_bug.cgi?id=98196
+
+        Reviewed by Eric Seidel.
+
+        Making the test more flexible to check for cygwin and allow different outputs from process.wait().
+
+        * Scripts/webkitpy/common/system/executive_unittest.py:
+        (ExecutiveTest.serial_test_kill_process):
+
 2012-10-02  Roger Fong  <roger_fong@apple.com>
 

trunk/Tools/Scripts/webkitpy/common/system/executive_unittest.py

@@ -163 +163 @@
             # We seem to get either 0 or 1 here for some reason.
             self.assertTrue(process.wait() in (0, 1))
+        elif sys.platform == "cygwin":
+            # FIXME: https://bugs.webkit.org/show_bug.cgi?id=98196
+            # cygwin seems to give us either SIGABRT or SIGKILL
+            self.assertTrue(process.wait() in (-signal.SIGABRT, -signal.SIGKILL))
         else:
             expected_exit_code = -signal.SIGKILL