Changeset 73320 in webkit

Timestamp:

Dec 3, 2010 5:46:22 PM (13 years ago)

Author:

mihaip@chromium.org

Message:

2010-12-03 Mihai Parparita <​mihaip@chromium.org>

Reviewed by Tony Chang.

Rebaseline server: use pretty text diff output
​https://bugs.webkit.org/show_bug.cgi?id=50484

Serve *-pretty-diff.html for text diff output.

• Scripts/webkitpy/tool/commands/data/rebaselineserver/index.html:
• Scripts/webkitpy/tool/commands/data/rebaselineserver/main.css:
• Scripts/webkitpy/tool/commands/data/rebaselineserver/main.js:
• Scripts/webkitpy/tool/commands/rebaselineserver.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/tool/commands/data/rebaselineserver/index.html (modified) (1 diff)
• Scripts/webkitpy/tool/commands/data/rebaselineserver/main.css (modified) (1 diff)
• Scripts/webkitpy/tool/commands/data/rebaselineserver/main.js (modified) (2 diffs)
• Scripts/webkitpy/tool/commands/rebaselineserver.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-12-03  Mihai Parparita  <mihaip@chromium.org>
+
+        Reviewed by Tony Chang.
+
+        Rebaseline server: use pretty text diff output
+        https://bugs.webkit.org/show_bug.cgi?id=50484
+        
+        Serve *-pretty-diff.html for text diff output.
+
+        * Scripts/webkitpy/tool/commands/data/rebaselineserver/index.html:
+        * Scripts/webkitpy/tool/commands/data/rebaselineserver/main.css:
+        * Scripts/webkitpy/tool/commands/data/rebaselineserver/main.js:
+        * Scripts/webkitpy/tool/commands/rebaselineserver.py:
+
 2010-12-03  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/WebKitTools/Scripts/webkitpy/tool/commands/data/rebaselineserver/index.html

@@ -113 +113 @@
     </tr>
     <tr>
-      <td><pre id="expected-text"></pre></td>
-      <td><pre id="actual-text"></pre></td>
-      <td><pre id="diff-text"><pre></td>
+      <td><pre id="expected-text" class="text-output"></pre></td>
+      <td><pre id="actual-text" class="text-output"></pre></td>
+      <td><div id="diff-text-pretty" class="text-output"></div></td>
     </tr>
   </tbody>

trunk/WebKitTools/Scripts/webkitpy/tool/commands/data/rebaselineserver/main.css

@@ -181 +181 @@
 }
 
-#text-outputs pre {
+#text-outputs .text-output {
   height: 600px;
   width: 800px;

trunk/WebKitTools/Scripts/webkitpy/tool/commands/data/rebaselineserver/main.js

@@ -487 +487 @@
 }
 
-function loadTextResult(testName, mode)
+function loadTextResult(testName, mode, responseIsHtml)
 {
     loadText(getTestResultUrl(testName, mode), function(text) {
-        $(mode).textContent = text;
+        if (responseIsHtml) {
+            $(mode).innerHTML = text;
+        } else {
+            $(mode).textContent = text;
+        }
     });
 }
@@ -498 +502 @@
     loadTextResult(testName, 'expected-text');
     loadTextResult(testName, 'actual-text');
-    loadTextResult(testName, 'diff-text');
+    loadTextResult(testName, 'diff-text-pretty', true);
 }
 

trunk/WebKitTools/Scripts/webkitpy/tool/commands/rebaselineserver.py

@@ -174 +174 @@
         elif mode == 'diff-text':
             file_name = test_name + '-diff.txt'
+        elif mode == 'diff-text-pretty':
+            file_name = test_name + '-pretty-diff.html'
 
         file_path = os.path.join(self.server.test_config.results_directory, file_name)