Title: [97470] trunk/Tools
- Revision
- 97470
- Author
- [email protected]
- Date
- 2011-10-14 08:50:33 -0700 (Fri, 14 Oct 2011)
Log Message
new-run-webkit-tests does not support qt-4.8 results
https://bugs.webkit.org/show_bug.cgi?id=64071
Roll-back second part of r97252. :)
* Scripts/webkitpy/layout_tests/port/qt.py:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (97469 => 97470)
--- trunk/Tools/ChangeLog 2011-10-14 15:36:39 UTC (rev 97469)
+++ trunk/Tools/ChangeLog 2011-10-14 15:50:33 UTC (rev 97470)
@@ -1,3 +1,12 @@
+2011-10-14 Csaba Osztrogonác <[email protected]>
+
+ new-run-webkit-tests does not support qt-4.8 results
+ https://bugs.webkit.org/show_bug.cgi?id=64071
+
+ Roll-back second part of r97252. :)
+
+ * Scripts/webkitpy/layout_tests/port/qt.py:
+
2011-10-14 Raphael Kubo da Costa <[email protected]>
[EFL] DRT: Do not use OwnFastMallocPtr to manage char*'s.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py (97469 => 97470)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py 2011-10-14 15:36:39 UTC (rev 97469)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py 2011-10-14 15:50:33 UTC (rev 97470)
@@ -119,6 +119,19 @@
search_paths.append(self.port_name)
return map(self._webkit_baseline_path, search_paths)
+ def _skipped_file_search_paths(self):
+ search_paths = set([self.port_name, self.name()])
+ version = self.qt_version()
+ if '4.7' in version:
+ search_paths.add('qt-4.7')
+ elif '4.8' in version:
+ search_paths.add('qt-4.8')
+ elif version:
+ search_paths.add('qt-5.0')
+ if self.get_option('webkit_test_runner'):
+ search_paths.update(['qt-wk2', 'wk2'])
+ return search_paths
+
def _runtime_feature_list(self):
return None
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
