Title: [94592] trunk/Tools
- Revision
- 94592
- Author
- [email protected]
- Date
- 2011-09-06 13:32:38 -0700 (Tue, 06 Sep 2011)
Log Message
[chromium] Check in 'build' for compiled binaries first
https://bugs.webkit.org/show_bug.cgi?id=67549
Reviewed by Dirk Pranke.
I'm working on moving the windows build output to a common location
rather than relative to the sln file. Because of that, we need to
check those build locations first for DumpRenderTree.exe.
* Scripts/webkitpy/layout_tests/port/chromium_win.py:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (94591 => 94592)
--- trunk/Tools/ChangeLog 2011-09-06 19:50:19 UTC (rev 94591)
+++ trunk/Tools/ChangeLog 2011-09-06 20:32:38 UTC (rev 94592)
@@ -1,3 +1,16 @@
+2011-09-06 Tony Chang <[email protected]>
+
+ [chromium] Check in 'build' for compiled binaries first
+ https://bugs.webkit.org/show_bug.cgi?id=67549
+
+ Reviewed by Dirk Pranke.
+
+ I'm working on moving the windows build output to a common location
+ rather than relative to the sln file. Because of that, we need to
+ check those build locations first for DumpRenderTree.exe.
+
+ * Scripts/webkitpy/layout_tests/port/chromium_win.py:
+
2011-09-06 Adam Barth <[email protected]>
Use a hierarchial structure for the garden-o-matic results view
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py (94591 => 94592)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py 2011-09-06 19:50:19 UTC (rev 94591)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win.py 2011-09-06 20:32:38 UTC (rev 94592)
@@ -156,12 +156,18 @@
if self.get_option('build_directory'):
return self._filesystem.join(self.get_option('build_directory'), *comps)
+ p = self.path_from_chromium_base('build', *comps)
+ if self._filesystem.exists(p):
+ return p
p = self.path_from_chromium_base('webkit', *comps)
if self._filesystem.exists(p):
return p
p = self.path_from_chromium_base('chrome', *comps)
if self._filesystem.exists(p):
return p
+ p = self._filesystem.join(self.path_from_webkit_base(), 'Source', 'WebKit', 'chromium', 'build', *comps)
+ if self._filesystem.exists(p):
+ return p
return self._filesystem.join(self.path_from_webkit_base(), 'Source', 'WebKit', 'chromium', *comps)
def _uses_apache(self):
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py (94591 => 94592)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py 2011-09-06 19:50:19 UTC (rev 94591)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py 2011-09-06 20:32:38 UTC (rev 94592)
@@ -31,6 +31,7 @@
import unittest
from webkitpy.common.system import outputcapture
+from webkitpy.common.system.filesystem_mock import MockFileSystem
from webkitpy.tool import mocktool
from webkitpy.layout_tests.port import chromium_win
@@ -134,7 +135,18 @@
port = chromium_win.ChromiumWinPort(port_name='chromium-win-win7')
self.assertEquals(port.baseline_path(), port._webkit_baseline_path('chromium-win'))
+ def test_build_path(self):
+ mock = MockFileSystem(files={
+ '/mock-checkout/Source/WebKit/chromium/build/Release/DumpRenderTree.exe': 'exe'})
+ port = chromium_win.ChromiumWinPort(filesystem=mock)
+ self.assertEquals(
+ '/mock-checkout/Source/WebKit/chromium/build/Release/DumpRenderTree.exe',
+ port._path_to_driver('Release'))
+ self.assertEquals(
+ '/mock-checkout/Source/WebKit/chromium/Debug/DumpRenderTree.exe',
+ port._path_to_driver('Debug'))
+
if __name__ == '__main__':
port_testcase.main()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
