Title: [109282] trunk/Tools
- Revision
- 109282
- Author
- [email protected]
- Date
- 2012-02-29 16:33:13 -0800 (Wed, 29 Feb 2012)
Log Message
nrwt: make --print trace work with virtual tests
https://bugs.webkit.org/show_bug.cgi?id=79952
Reviewed by Adam Barth.
* Scripts/webkitpy/layout_tests/views/printing.py:
(Printer._print_test_trace):
(Printer._print_baseline):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (109281 => 109282)
--- trunk/Tools/ChangeLog 2012-03-01 00:27:52 UTC (rev 109281)
+++ trunk/Tools/ChangeLog 2012-03-01 00:33:13 UTC (rev 109282)
@@ -1,3 +1,14 @@
+2012-02-29 Dirk Pranke <[email protected]>
+
+ nrwt: make --print trace work with virtual tests
+ https://bugs.webkit.org/show_bug.cgi?id=79952
+
+ Reviewed by Adam Barth.
+
+ * Scripts/webkitpy/layout_tests/views/printing.py:
+ (Printer._print_test_trace):
+ (Printer._print_baseline):
+
2012-02-28 Brian Weinstein <[email protected]>
WebKit2: didNewFirstVisuallyNonEmptyLayout should be sent to injected bundle
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/views/printing.py (109281 => 109282)
--- trunk/Tools/Scripts/webkitpy/layout_tests/views/printing.py 2012-03-01 00:27:52 UTC (rev 109281)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/views/printing.py 2012-03-01 00:33:13 UTC (rev 109282)
@@ -315,18 +315,25 @@
- actual result
- timing info
"""
- filename = self._port.abspath_for_test(result.test_name)
test_name = result.test_name
self._write('trace: %s' % test_name)
+
+ base = self._port.lookup_virtual_test_base(test_name)
+ if base:
+ args = ' '.join(self._port.lookup_virtual_test_args(test_name))
+ self._write(' base: %s' % base)
+ self._write(' args: %s' % args)
+
for extension in ('.txt', '.png', '.wav', '.webarchive'):
- self._print_baseline(filename, extension)
+ self._print_baseline(test_name, extension)
+
self._write(' exp: %s' % exp_str)
self._write(' got: %s' % got_str)
self._write(' took: %-.3f' % result.test_run_time)
self._write('')
- def _print_baseline(self, filename, extension):
- baseline = self._port.expected_filename(filename, extension)
+ def _print_baseline(self, test_name, extension):
+ baseline = self._port.expected_filename(test_name, extension)
if self._port._filesystem.exists(baseline):
relpath = self._port.relative_test_filename(baseline)
else:
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
