Title: [101451] trunk/Tools
- Revision
- 101451
- Author
- [email protected]
- Date
- 2011-11-29 23:53:47 -0800 (Tue, 29 Nov 2011)
Log Message
[NRWT] Fix --platform=qt-5.0 --new-baseline combo
https://bugs.webkit.org/show_bug.cgi?id=72489
Patch by Balazs Ankes <[email protected]> on 2011-11-29
Reviewed by Eric Seidel.
Before the this fix always added "qt" option for the option list
* Scripts/run-webkit-tests:
* Scripts/webkitpy/layout_tests/port/qt.py:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (101450 => 101451)
--- trunk/Tools/ChangeLog 2011-11-30 06:03:13 UTC (rev 101450)
+++ trunk/Tools/ChangeLog 2011-11-30 07:53:47 UTC (rev 101451)
@@ -1,3 +1,14 @@
+2011-11-29 Balazs Ankes <[email protected]>
+
+ [NRWT] Fix --platform=qt-5.0 --new-baseline combo
+ https://bugs.webkit.org/show_bug.cgi?id=72489
+
+ Reviewed by Eric Seidel.
+
+ Before the this fix always added "qt" option for the option list
+ * Scripts/run-webkit-tests:
+ * Scripts/webkitpy/layout_tests/port/qt.py:
+
2011-11-29 David Levin <[email protected]>
Add a way to revert a variable to its previous value after leaving a scope.
Modified: trunk/Tools/Scripts/run-webkit-tests (101450 => 101451)
--- trunk/Tools/Scripts/run-webkit-tests 2011-11-30 06:03:13 UTC (rev 101450)
+++ trunk/Tools/Scripts/run-webkit-tests 2011-11-30 07:53:47 UTC (rev 101451)
@@ -99,7 +99,14 @@
# webkitdirs.pm strips --qt and --gtk from @ARGV when we call isQt/isGtk.
# We have to add back any --PORT arguments which may have been removed by isPort() checks above.
if (isQt()) {
- push(@ARGV, "--qt");
+ my $isPlatformSet = 0;
+ for (@ARGV){
+ # Pass --qt if platform isn't passed explicitly (eg. qt-5.0, qt-wk2, ...)
+ if(/^--platform.*/){
+ $isPlatformSet = 1;
+ }
+ }
+ push(@ARGV, "--qt") if(!$isPlatformSet);
} elsif (isGtk()) {
push(@ARGV, "--gtk");
}
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py (101450 => 101451)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py 2011-11-30 06:03:13 UTC (rev 101450)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py 2011-11-30 07:53:47 UTC (rev 101451)
@@ -59,18 +59,23 @@
return None
# sys_platform exists only for unit testing.
- def __init__(self, host, sys_platform=None, **kwargs):
- WebKitPort.__init__(self, host, **kwargs)
+ def __init__(self, host, port_name=None, sys_platform=None, **kwargs):
+ port_name = port_name or self.port_name
+ WebKitPort.__init__(self, host, port_name=None, **kwargs)
self._operating_system = self._operating_system_for_platform(sys_platform or sys.platform)
self._version = self._operating_system
# FIXME: This will allow WebKitPort.baseline_search_path and WebKitPort._skipped_file_search_paths
# to do the right thing, but doesn't include support for qt-4.8 or qt-arm (seen in LayoutTests/platform) yet.
- name_components = [self.port_name]
- if self._operating_system:
- name_components.append(self._operating_system)
- self._name = "-".join(name_components)
+ if port_name != self.port_name:
+ self._name = port_name
+ else:
+ name_components = [self.port_name]
+ if self._operating_system:
+ name_components.append(self._operating_system)
+ self._name = "-".join(name_components)
+
def _generate_all_test_configurations(self):
configurations = []
for version in self.ALL_VERSIONS:
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
