Title: [91215] trunk/Tools
- Revision
- 91215
- Author
- [email protected]
- Date
- 2011-07-18 15:36:24 -0700 (Mon, 18 Jul 2011)
Log Message
webkit-patch apply-attachment does not work when not called from the root of the checkout
https://bugs.webkit.org/show_bug.cgi?id=64751
Unreviewed. Just updating unit test results after bug 64751.
* Scripts/webkitpy/layout_tests/port/chromium_win.py:
* Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (91214 => 91215)
--- trunk/Tools/ChangeLog 2011-07-18 22:27:54 UTC (rev 91214)
+++ trunk/Tools/ChangeLog 2011-07-18 22:36:24 UTC (rev 91215)
@@ -1,3 +1,13 @@
+2011-07-18 Eric Seidel <[email protected]>
+
+ webkit-patch apply-attachment does not work when not called from the root of the checkout
+ https://bugs.webkit.org/show_bug.cgi?id=64751
+
+ Unreviewed. Just updating unit test results after bug 64751.
+
+ * Scripts/webkitpy/layout_tests/port/chromium_win.py:
+ * Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py:
+
2011-07-18 Adam Barth <[email protected]>
simplejson has trouble on chromium-linux
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py (91214 => 91215)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py 2011-07-18 22:27:54 UTC (rev 91214)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py 2011-07-18 22:36:24 UTC (rev 91215)
@@ -101,18 +101,13 @@
def setup_environ_for_server(self):
env = chromium.ChromiumPort.setup_environ_for_server(self)
# Put the cygwin directory first in the path to find cygwin1.dll.
- env["PATH"] = "%s;%s" % (
- self.path_from_chromium_base("third_party", "cygwin", "bin"),
- env["PATH"])
+ env["PATH"] = "%s;%s" % (self.path_from_chromium_base("third_party", "cygwin", "bin"), env["PATH"])
# Configure the cygwin directory so that pywebsocket finds proper
# python executable to run cgi program.
- env["CYGWIN_PATH"] = self.path_from_chromium_base(
- "third_party", "cygwin", "bin")
+ env["CYGWIN_PATH"] = self.path_from_chromium_base("third_party", "cygwin", "bin")
if (sys.platform in ("cygwin", "win32") and self.get_option('register_cygwin')):
- setup_mount = self.path_from_chromium_base("third_party",
- "cygwin",
- "setup_mount.bat")
- self._executive.run_command([setup_mount])
+ setup_mount = self.path_from_chromium_base("third_party", "cygwin", "setup_mount.bat")
+ self._executive.run_command([setup_mount]) # Paths are all absolute, so this does not require a cwd.
return env
def baseline_search_path(self):
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py (91214 => 91215)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py 2011-07-18 22:27:54 UTC (rev 91214)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py 2011-07-18 22:36:24 UTC (rev 91215)
@@ -88,7 +88,7 @@
port.path_from_chromium_base = self._mock_path_from_chromium_base
self._port = port
setup_mount = self._mock_path_from_chromium_base("third_party", "cygwin", "setup_mount.bat")
- expected_stderr = "MOCK run_command: %s\n" % [setup_mount]
+ 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
