Changeset 109282 in webkit

Timestamp:

Feb 29, 2012 4:33:13 PM (12 years ago)

Author:

dpranke@chromium.org

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):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/views/printing.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-02-29  Dirk Pranke  <dpranke@chromium.org>
+
+        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  <bweinstein@apple.com>
 

trunk/Tools/Scripts/webkitpy/layout_tests/views/printing.py

@@ -316 +316 @@
            - 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)
@@ -326 +333 @@
         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)