Title: [99791] trunk/Tools
Revision
99791
Author
[email protected]
Date
2011-11-09 17:21:36 -0800 (Wed, 09 Nov 2011)

Log Message

Remove the concept of platform-dependent unittests
https://bugs.webkit.org/show_bug.cgi?id=71963

Unreviewed.  Fix test-webkitpy on cygwin.

* Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py:

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (99790 => 99791)


--- trunk/Tools/ChangeLog	2011-11-10 01:16:30 UTC (rev 99790)
+++ trunk/Tools/ChangeLog	2011-11-10 01:21:36 UTC (rev 99791)
@@ -1,3 +1,12 @@
+2011-11-09  Eric Seidel  <[email protected]>
+
+        Remove the concept of platform-dependent unittests
+        https://bugs.webkit.org/show_bug.cgi?id=71963
+
+        Unreviewed.  Fix test-webkitpy on cygwin.
+
+        * Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py:
+
 2011-11-09  Dana Jansens  <[email protected]>
 
         Add cc-bugs group to watch changes in chromium graphics

Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py (99790 => 99791)


--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py	2011-11-10 01:16:30 UTC (rev 99790)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py	2011-11-10 01:21:36 UTC (rev 99791)
@@ -73,10 +73,10 @@
         self._port = port
         setup_mount = self._mock_path_from_chromium_base("third_party", "cygwin", "setup_mount.bat")
         # FIXME: This is kinda lame, we only run setup_mount on win32 platforms, so we only expect the run_command output there.
-        if sys.platform != "win32":
+        if sys.platform in ("win32", "cygwin"):
+            expected_stderr = "MOCK run_command: %s, cwd=None\n" % [setup_mount]
+        else:
             expected_stderr = ""
-        else:
-            expected_stderr = "MOCK run_command: %s, cwd=None\n" % [setup_mount]
         output = outputcapture.OutputCapture()
         output.assert_outputs(self, port.setup_environ_for_server, expected_stderr=expected_stderr)
 
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to