Title: [109937] trunk/Tools
- Revision
- 109937
- Author
- [email protected]
- Date
- 2012-03-06 11:08:26 -0800 (Tue, 06 Mar 2012)
Log Message
Enable universal newlines in chromium android layout test runner
https://bugs.webkit.org/show_bug.cgi?id=80418
Patch by Sami Kyostila <[email protected]> on 2012-03-06
Reviewed by Adam Barth.
The Chromium Android layout test runner uses the 'adb' program to
communicate with the Android device. Adb uses CRLF ('\r\n') to delimit
output lines from the test runner, while the test expectation files are
written with LF ('\n') delimiters. This causes the results to have
spurious whitespace differences, making them more difficult to
interpret.
The fix is to enable universal newlines for the DumpRenderTree pipe,
causing the output to only contain LF newlines like on other platforms.
* Scripts/webkitpy/layout_tests/port/chromium_android.py:
(ChromiumAndroidDriver._start):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (109936 => 109937)
--- trunk/Tools/ChangeLog 2012-03-06 19:07:12 UTC (rev 109936)
+++ trunk/Tools/ChangeLog 2012-03-06 19:08:26 UTC (rev 109937)
@@ -1,3 +1,23 @@
+2012-03-06 Sami Kyostila <[email protected]>
+
+ Enable universal newlines in chromium android layout test runner
+ https://bugs.webkit.org/show_bug.cgi?id=80418
+
+ Reviewed by Adam Barth.
+
+ The Chromium Android layout test runner uses the 'adb' program to
+ communicate with the Android device. Adb uses CRLF ('\r\n') to delimit
+ output lines from the test runner, while the test expectation files are
+ written with LF ('\n') delimiters. This causes the results to have
+ spurious whitespace differences, making them more difficult to
+ interpret.
+
+ The fix is to enable universal newlines for the DumpRenderTree pipe,
+ causing the output to only contain LF newlines like on other platforms.
+
+ * Scripts/webkitpy/layout_tests/port/chromium_android.py:
+ (ChromiumAndroidDriver._start):
+
2012-03-06 Tor Arne Vestbø <[email protected]>
[Qt] Revert r109900, it was completly busted
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py (109936 => 109937)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py 2012-03-06 19:07:12 UTC (rev 109936)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py 2012-03-06 19:08:26 UTC (rev 109937)
@@ -424,7 +424,8 @@
while True:
_log.debug('Starting adb shell for DumpRenderTree: ' + ' '.join(shell_cmd))
executive = self._port.host.executive
- self._proc = executive.Popen(shell_cmd, stdin=executive.PIPE, stdout=executive.PIPE, stderr=executive.STDOUT, close_fds=True)
+ self._proc = executive.popen(shell_cmd, stdin=executive.PIPE, stdout=executive.PIPE, stderr=executive.STDOUT,
+ close_fds=True, universal_newlines=True)
# Read back the shell prompt to ensure adb shell ready.
self._read_prompt()
# Some tests rely on this to produce proper number format etc.,
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
