Modified: trunk/Tools/ChangeLog (118897 => 118898)
--- trunk/Tools/ChangeLog 2012-05-30 06:34:18 UTC (rev 118897)
+++ trunk/Tools/ChangeLog 2012-05-30 06:37:54 UTC (rev 118898)
@@ -1,3 +1,16 @@
+2012-05-29 János Badics <[email protected]>
+
+ [Qt] Modified ORWT and NRWT to check for test expectations in platform/qt-5.0-wk1 too
+ (They only used to check for Skipped in platform/qt-5.0-wk1)
+ https://bugs.webkit.org/show_bug.cgi?id=87376
+
+ Reviewed by Csaba Osztrogonác.
+
+ * Scripts/old-run-webkit-tests:
+ (buildPlatformResultHierarchy):
+ * Scripts/webkitpy/layout_tests/port/qt.py:
+ (QtPort.baseline_search_path):
+
2012-05-29 Ojan Vafai <[email protected]>
Add a linter error for pngs that lack an embedded checksum
Modified: trunk/Tools/Scripts/old-run-webkit-tests (118897 => 118898)
--- trunk/Tools/Scripts/old-run-webkit-tests 2012-05-30 06:34:18 UTC (rev 118897)
+++ trunk/Tools/Scripts/old-run-webkit-tests 2012-05-30 06:37:54 UTC (rev 118898)
@@ -2158,9 +2158,12 @@
@platforms = $platform;
}
} elsif ($platform =~ /^qt/) {
- if ($platform eq "qt-5.0-wk2") {
- push @platforms, $platform;
+ if ($platform eq "qt-5.0-wk2" || getQtVersion() eq "5.0" && $useWebKitTestRunner) {
+ push @platforms, "qt-5.0-wk2";
}
+ elsif ($platform eq "qt-5.0-wk1" || getQtVersion() eq "5.0" && !$useWebKitTestRunner) {
+ push @platforms, "qt-5.0-wk1"
+ }
if (isARM() || $platform eq "qt-arm") {
push @platforms, "qt-arm";
@@ -2488,9 +2491,6 @@
# additionally to their own to avoid maintaining separate lists.
push(@skippedFileDirectories, catdir($platformBaseDirectory, "wk2")) if ($platform eq "win-wk2" || $platform eq "qt-5.0-wk2" || $platform eq "mac-wk2" || $platform eq "gtk-wk2");
- # Add Qt WK1-only skipped tests.
- push(@skippedFileDirectories, catdir($platformBaseDirectory, "qt-5.0-wk1")) if (isQt() && !$useWebKitTestRunner);
-
if ($verbose) {
foreach my $skippedPath (@skippedFileDirectories) {
print "Using Skipped file: $skippedPath\n";
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py (118897 => 118898)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py 2012-05-30 06:34:18 UTC (rev 118897)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/qt.py 2012-05-30 06:37:54 UTC (rev 118898)
@@ -111,10 +111,13 @@
def baseline_search_path(self):
search_paths = []
- if self.get_option('webkit_test_runner'):
- search_paths.append(self._wk2_port_name())
+ version = self.qt_version()
+ if '5.0' in version:
+ if self.get_option('webkit_test_runner'):
+ search_paths.append('qt-5.0-wk2')
+ else:
+ search_paths.append('qt-5.0-wk1')
search_paths.append(self.name())
- version = self.qt_version()
if '4.8' in version:
search_paths.append('qt-4.8')
elif version:
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/qt_unittest.py (118897 => 118898)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/qt_unittest.py 2012-05-30 06:34:18 UTC (rev 118897)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/qt_unittest.py 2012-05-30 06:37:54 UTC (rev 118898)
@@ -72,6 +72,10 @@
self._assert_search_path(['qt-5.0-wk2', 'qt-win', 'qt-5.0', 'qt'], 'win', use_webkit2=True, qt_version='5.0')
self._assert_search_path(['qt-5.0-wk2', 'qt-linux', 'qt-5.0', 'qt'], 'linux', use_webkit2=True, qt_version='5.0')
+ self._assert_search_path(['qt-5.0-wk1', 'qt-mac', 'qt-5.0', 'qt'], 'mac', use_webkit2=False, qt_version='5.0')
+ self._assert_search_path(['qt-5.0-wk1', 'qt-win', 'qt-5.0', 'qt'], 'win', use_webkit2=False, qt_version='5.0')
+ self._assert_search_path(['qt-5.0-wk1', 'qt-linux', 'qt-5.0', 'qt'], 'linux', use_webkit2=False, qt_version='5.0')
+
def test_show_results_html_file(self):
port = self.make_port()
port._executive = MockExecutive(should_log=True)
