Title: [97309] trunk/Tools
- Revision
- 97309
- Author
- [email protected]
- Date
- 2011-10-12 15:20:54 -0700 (Wed, 12 Oct 2011)
Log Message
Fix test-webkitpy after r97307 and r97293.
* Scripts/webkitpy/layout_tests/port/chromium.py: options.time_out_ms
is None during tests so add back the check.
* Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py: The
output directory is now build/Debug.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (97308 => 97309)
--- trunk/Tools/ChangeLog 2011-10-12 22:14:33 UTC (rev 97308)
+++ trunk/Tools/ChangeLog 2011-10-12 22:20:54 UTC (rev 97309)
@@ -1,5 +1,14 @@
2011-10-12 Tony Chang <[email protected]>
+ Fix test-webkitpy after r97307 and r97293.
+
+ * Scripts/webkitpy/layout_tests/port/chromium.py: options.time_out_ms
+ is None during tests so add back the check.
+ * Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py: The
+ output directory is now build/Debug.
+
+2011-10-12 Tony Chang <[email protected]>
+
[chromium] remove old build dirs on chromium-win
https://bugs.webkit.org/show_bug.cgi?id=69961
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py (97308 => 97309)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py 2011-10-12 22:14:33 UTC (rev 97308)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py 2011-10-12 22:20:54 UTC (rev 97309)
@@ -597,7 +597,10 @@
if self._proc.stderr:
self._proc.stderr.close()
time_out_ms = self._port.get_option('time_out_ms')
- kill_timeout_seconds = 3.0 * int(time_out_ms) / Manager.DEFAULT_TEST_TIMEOUT_MS
+ if time_out_ms:
+ kill_timeout_seconds = 3.0 * int(time_out_ms) / Manager.DEFAULT_TEST_TIMEOUT_MS
+ else:
+ kill_timeout_seconds = 3.0
# Closing stdin/stdout/stderr hangs sometimes on OS X,
# (see __init__(), above), and anyway we don't want to hang
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py (97308 => 97309)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py 2011-10-12 22:14:33 UTC (rev 97308)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_win_unittest.py 2011-10-12 22:20:54 UTC (rev 97309)
@@ -144,7 +144,7 @@
'/mock-checkout/Source/WebKit/chromium/build/Release/DumpRenderTree.exe',
port._path_to_driver('Release'))
self.assertEquals(
- '/mock-checkout/Source/WebKit/chromium/Debug/DumpRenderTree.exe',
+ '/mock-checkout/Source/WebKit/chromium/build/Debug/DumpRenderTree.exe',
port._path_to_driver('Debug'))
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
