Title: [90752] trunk/Tools
- Revision
- 90752
- Author
- o...@webkit.org
- Date
- 2011-07-11 08:58:44 -0700 (Mon, 11 Jul 2011)
Log Message
[Qt][Mac] Unreviewed fix after r90746.
* Scripts/run-webkit-tests:
(useNewRunWebKitTests): Really disable NRWT for qt-mac platform.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (90751 => 90752)
--- trunk/Tools/ChangeLog 2011-07-11 15:55:31 UTC (rev 90751)
+++ trunk/Tools/ChangeLog 2011-07-11 15:58:44 UTC (rev 90752)
@@ -1,3 +1,10 @@
+2011-07-11 Csaba Osztrogonác <o...@webkit.org>
+
+ [Qt][Mac] Unreviewed fix after r90746.
+
+ * Scripts/run-webkit-tests:
+ (useNewRunWebKitTests): Really disable NRWT for qt-mac platform.
+
2011-07-11 Adam Roben <aro...@apple.com>
Teach TestFailures that ORWT's results.html file might be missing due to all tests passing
Modified: trunk/Tools/Scripts/run-webkit-tests (90751 => 90752)
--- trunk/Tools/Scripts/run-webkit-tests 2011-07-11 15:55:31 UTC (rev 90751)
+++ trunk/Tools/Scripts/run-webkit-tests 2011-07-11 15:58:44 UTC (rev 90752)
@@ -85,7 +85,11 @@
# NRWT Windows support still needs work: https://bugs.webkit.org/show_bug.cgi?id=38756
# NRWT doesn't support qt-mac, qt-arm and qt-4.8 platforms now: https://bugs.webkit.org/show_bug.cgi?id=64071 and https://bugs.webkit.org/show_bug.cgi?id=64086
- return ((isLeopard() or isSnowLeopard() or (isQt() and !isDarwin() and !isARM() and (getQtVersion() ne "4.8")) or isGtk()) and !usingWebKit2() and !usingLeaks());
+ if (isQt()) {
+ return (!usingWebKit2() and !isDarwin() and !isARM() and (getQtVersion() ne "4.8"));
+ }
+
+ return ((isLeopard() or isSnowLeopard() or isGtk()) and !usingWebKit2() and !usingLeaks());
}
my $harnessName = "old-run-webkit-tests";
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
