Title: [104753] trunk/Tools
- Revision
- 104753
- Author
- [email protected]
- Date
- 2012-01-11 15:42:27 -0800 (Wed, 11 Jan 2012)
Log Message
Unreviewed, fix build bustage on win32 introduced by r104725.
* Scripts/webkitpy/layout_tests/port/mock_drt_unittest.py:
(MockDRTPortTest.make_port):
(MockChromiumDRTTest.test_pixeltest__fails):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (104752 => 104753)
--- trunk/Tools/ChangeLog 2012-01-11 23:27:25 UTC (rev 104752)
+++ trunk/Tools/ChangeLog 2012-01-11 23:42:27 UTC (rev 104753)
@@ -1,3 +1,11 @@
+2012-01-11 Dirk Pranke <[email protected]>
+
+ Unreviewed, fix build bustage on win32 introduced by r104725.
+
+ * Scripts/webkitpy/layout_tests/port/mock_drt_unittest.py:
+ (MockDRTPortTest.make_port):
+ (MockChromiumDRTTest.test_pixeltest__fails):
+
2012-01-11 Jochen Eisinger <[email protected]>
[Chromium] mimic the (old) behavior of the mac port for (re)setting the color profile
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/mock_drt_unittest.py (104752 => 104753)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/mock_drt_unittest.py 2012-01-11 23:27:25 UTC (rev 104752)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/mock_drt_unittest.py 2012-01-11 23:42:27 UTC (rev 104753)
@@ -50,6 +50,8 @@
test.add_unit_tests_to_mock_filesystem(host.filesystem)
if sys.platform == 'win32':
# We use this because the 'win' port doesn't work yet.
+ host.platform.os_name = 'win'
+ host.platform.os_version = 'xp'
return mock_drt.MockDRTPort(host, port_name='mock-chromium-win', options=options)
return mock_drt.MockDRTPort(host, options=options)
@@ -238,7 +240,11 @@
def test_pixeltest__fails(self):
host = MockSystemHost()
- url = '' % PortFactory(host).get('test').layout_tests_dir()
+ url = ''
+ if sys.platform == 'win32':
+ host = MockSystemHost(os_name='win', os_version='xp')
+ url = ''
+ url = "" + '%s/failures/expected/checksum.html' % PortFactory(host).get('test').layout_tests_dir()
self.assertTest('failures/expected/checksum.html', pixel_tests=True,
expected_checksum='wrong-checksum',
drt_output=[url + '\n',
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
