Title: [110115] trunk/Tools
- Revision
- 110115
- Author
- [email protected]
- Date
- 2012-03-07 15:21:02 -0800 (Wed, 07 Mar 2012)
Log Message
[NRWT] Fix --platform=qt-5.0 --new-baseline combo
https://bugs.webkit.org/show_bug.cgi?id=72489
Patch by Rafael Brandao <[email protected]> on 2012-03-07
Reviewed by Dirk Pranke.
NRWT: The default platform name for Qt combined with --webkit-test-runner is now
"qt-5.0-wk2" instead of "qt-linux" and that name is now prefered for tests.
--platform will override the platform name and then we'll use it.
ORWT: We check for qt version and use platform name "qt-4.8" if the version is lower
than 5.0.0, and then we choose between "qt-5.0-wk1" and "qt-5.0-wk2". --platform will
override it in the end.
* Scripts/old-run-webkit-tests:
* Scripts/webkitpy/layout_tests/port/qt.py:
(QtPort):
(QtPort.determine_full_port_name):
(QtPort.baseline_search_path):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (110114 => 110115)
--- trunk/Tools/ChangeLog 2012-03-07 23:13:27 UTC (rev 110114)
+++ trunk/Tools/ChangeLog 2012-03-07 23:21:02 UTC (rev 110115)
@@ -1,3 +1,24 @@
+2012-03-07 Rafael Brandao <[email protected]>
+
+ [NRWT] Fix --platform=qt-5.0 --new-baseline combo
+ https://bugs.webkit.org/show_bug.cgi?id=72489
+
+ Reviewed by Dirk Pranke.
+
+ NRWT: The default platform name for Qt combined with --webkit-test-runner is now
+ "qt-5.0-wk2" instead of "qt-linux" and that name is now prefered for tests.
+ --platform will override the platform name and then we'll use it.
+
+ ORWT: We check for qt version and use platform name "qt-4.8" if the version is lower
+ than 5.0.0, and then we choose between "qt-5.0-wk1" and "qt-5.0-wk2". --platform will
+ override it in the end.
+
+ * Scripts/old-run-webkit-tests:
+ * Scripts/webkitpy/layout_tests/port/qt.py:
+ (QtPort):
+ (QtPort.determine_full_port_name):
+ (QtPort.baseline_search_path):
+
2012-03-07 Hugo Parente Lima <[email protected]>
[Qt][WK2] MiniBrowser on desktop does not react to click events
Modified: trunk/Tools/Scripts/old-run-webkit-tests (110114 => 110115)
--- trunk/Tools/Scripts/old-run-webkit-tests 2012-03-07 23:13:27 UTC (rev 110114)
+++ trunk/Tools/Scripts/old-run-webkit-tests 2012-03-07 23:21:02 UTC (rev 110115)
@@ -232,7 +232,11 @@
$platform = "mac";
}
} elsif (isQt()) {
- $platform = "qt";
+ if (getQtVersion() lt "5.0") {
+ $platform = "qt-4.8";
+ } else {
+ $platform = "qt-5.0-wk1";
+ }
} elsif (isGtk()) {
$platform = "gtk";
} elsif (isWx()) {
@@ -328,6 +332,23 @@
setConfiguration();
+if ($useWebKitTestRunner) {
+ if (isAppleMacWebKit()) {
+ $realPlatform = $platform;
+ $platform = "mac-wk2";
+ } elsif (isAppleWinWebKit()) {
+ $stripEditingCallbacks = 0 unless defined $stripEditingCallbacks;
+ $realPlatform = $platform;
+ $platform = "win-wk2";
+ } elsif (isQt()) {
+ $realPlatform = $platform;
+ $platform = "qt-5.0-wk2";
+ } elsif (isGtk()) {
+ $realPlatform = $platform;
+ $platform = "gtk-wk2";
+ }
+}
+
my $getOptionsResult = GetOptions(
'add-platform-exceptions' => \$addPlatformExceptions,
'additional-platform-directory=s' => \@additionalPlatformDirectories,
@@ -382,23 +403,6 @@
exit 1;
}
-if ($useWebKitTestRunner) {
- if (isAppleMacWebKit()) {
- $realPlatform = $platform;
- $platform = "mac-wk2";
- } elsif (isAppleWinWebKit()) {
- $stripEditingCallbacks = 0 unless defined $stripEditingCallbacks;
- $realPlatform = $platform;
- $platform = "win-wk2";
- } elsif (isQt()) {
- $realPlatform = $platform;
- $platform = "qt-5.0-wk2";
- } elsif (isGtk()) {
- $realPlatform = $platform;
- $platform = "gtk-wk2";
- }
-}
-
$timeoutSeconds *= 10 if $guardMalloc;
$stripEditingCallbacks = isCygwin() unless defined $stripEditingCallbacks;
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py (110114 => 110115)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py 2012-03-07 23:13:27 UTC (rev 110114)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py 2012-03-07 23:21:02 UTC (rev 110115)
@@ -47,6 +47,7 @@
ALL_VERSIONS = ['linux', 'win', 'mac']
port_name = "qt"
+ @classmethod
def _wk2_port_name(self):
return "qt-5.0-wk2"
@@ -57,6 +58,8 @@
def determine_full_port_name(cls, host, options, port_name):
if port_name and port_name != cls.port_name:
return port_name
+ if hasattr(options, 'webkit_test_runner') and getattr(options, 'webkit_test_runner'):
+ return cls._wk2_port_name()
return port_name + '-' + host.platform.os_name
# sys_platform exists only for unit testing.
@@ -108,8 +111,6 @@
def baseline_search_path(self):
search_paths = []
- if self.get_option('webkit_test_runner'):
- search_paths.append(self._wk2_port_name())
search_paths.append(self.name())
version = self.qt_version()
if '4.8' in version:
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
