Changeset 83980 in webkit

Timestamp:

Apr 15, 2011 9:00:01 AM (13 years ago)

Author:

ojan@chromium.org

Message:

2011-04-15 Ojan Vafai <​ojan@chromium.org>

Reviewed by Eric Seidel.

fix path to layout test in new results file
​https://bugs.webkit.org/show_bug.cgi?id=58618

• Scripts/webkitpy/layout_tests/layout_package/json_results.html:
• Scripts/webkitpy/layout_tests/layout_package/test_runner.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/layout_package/json_results.html (modified) (1 diff)
• Scripts/webkitpy/layout_tests/layout_package/test_runner.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-15  Ojan Vafai  <ojan@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        fix path to layout test in new results file
+        https://bugs.webkit.org/show_bug.cgi?id=58618
+
+        * Scripts/webkitpy/layout_tests/layout_package/json_results.html:
+        * Scripts/webkitpy/layout_tests/layout_package/test_runner.py:
+
 2011-04-15  Ojan Vafai  <ojan@chromium.org>
 

trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results.html

@@ -64 +64 @@
 html += '</tr></thead>';
 
-// FIXME: Should this point to the local file instead? Should it dynamically figure out where to point?
-var test_base_path = 'http://trac.webkit.org/browser/trunk/LayoutTests/';
+var test_base_path;
+if (results.layout_tests_dir && location.toString().indexOf('file://') != 0)
+    test_base_path = results.layout_tests_dir + '/';
+else
+    test_base_path = 'http://trac.webkit.org/browser/trunk/LayoutTests/';
 
 function resultLink(test_prefix, suffix, contents)

trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/test_runner.py

@@ -158 +158 @@
     # we should make this check more robust.
     results['uses_expectations_file'] = port_obj.name().find('chromium') != -1
+    results['layout_tests_dir'] = port_obj.layout_tests_dir()
 
     return results