Title: [93046] trunk/Tools
- Revision
- 93046
- Author
- [email protected]
- Date
- 2011-08-15 10:21:30 -0700 (Mon, 15 Aug 2011)
Log Message
Move the Leaks bot back to ORWT until I can fix LeaksViewer regressions filed by Adam Roben in bug 66227 and 66228.
Unreviewed.
* Scripts/run-webkit-tests:
(usingLeaks):
(useNewRunWebKitTests):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (93045 => 93046)
--- trunk/Tools/ChangeLog 2011-08-15 16:56:51 UTC (rev 93045)
+++ trunk/Tools/ChangeLog 2011-08-15 17:21:30 UTC (rev 93046)
@@ -1,3 +1,13 @@
+2011-08-15 Eric Seidel <[email protected]>
+
+ Move the Leaks bot back to ORWT until I can fix LeaksViewer regressions filed by Adam Roben in bug 66227 and 66228.
+
+ Unreviewed.
+
+ * Scripts/run-webkit-tests:
+ (usingLeaks):
+ (useNewRunWebKitTests):
+
2011-08-14 Adam Barth <[email protected]>
Switch results detail view over to new-style object-oriented UI widgets
Modified: trunk/Tools/Scripts/run-webkit-tests (93045 => 93046)
--- trunk/Tools/Scripts/run-webkit-tests 2011-08-15 16:56:51 UTC (rev 93045)
+++ trunk/Tools/Scripts/run-webkit-tests 2011-08-15 17:21:30 UTC (rev 93046)
@@ -65,6 +65,14 @@
return grep(/(-2|--webkit-test-runner)/, @ARGV);
}
+sub usingLeaks()
+{
+ # LeaksViewer gets confused by NRWT's --leaks output, see bugs:
+ # https://bugs.webkit.org/show_bug.cgi?id=66227
+ # https://bugs.webkit.org/show_bug.cgi?id=66228
+ return grep(/--leaks/, @ARGV);
+}
+
sub useNewRunWebKitTests()
{
# Change this check to control which platforms use new-run-webkit-tests by default.
@@ -82,7 +90,7 @@
return (!isDarwin() and !isARM() and (getQtVersion() ne "4.8"));
}
- return ((isLeopard() or isSnowLeopard() or isGtk()) and !usingWebKit2());
+ return ((isLeopard() or isSnowLeopard() or isGtk()) and !usingWebKit2() and !usingLeaks());
}
my $harnessName = "old-run-webkit-tests";
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
