Title: [90476] trunk/Tools
- Revision
- 90476
- Author
- [email protected]
- Date
- 2011-07-06 11:58:06 -0700 (Wed, 06 Jul 2011)
Log Message
2011-07-06 Adam Barth <[email protected]>
Use old-run-webkit-tests when --leaks is present
https://bugs.webkit.org/show_bug.cgi?id=64012
Reviewed by Adam Roben.
We'll remove this branch once support of --leaks is added to
new-run-webkit-tests.
* Scripts/run-webkit-tests:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (90475 => 90476)
--- trunk/Tools/ChangeLog 2011-07-06 18:41:45 UTC (rev 90475)
+++ trunk/Tools/ChangeLog 2011-07-06 18:58:06 UTC (rev 90476)
@@ -1,3 +1,15 @@
+2011-07-06 Adam Barth <[email protected]>
+
+ Use old-run-webkit-tests when --leaks is present
+ https://bugs.webkit.org/show_bug.cgi?id=64012
+
+ Reviewed by Adam Roben.
+
+ We'll remove this branch once support of --leaks is added to
+ new-run-webkit-tests.
+
+ * Scripts/run-webkit-tests:
+
2011-07-06 Benjamin Poulain <[email protected]>
[Qt] [WK2] Add touch mocking to Qt's MiniBrowser
Modified: trunk/Tools/Scripts/run-webkit-tests (90475 => 90476)
--- trunk/Tools/Scripts/run-webkit-tests 2011-07-06 18:41:45 UTC (rev 90475)
+++ trunk/Tools/Scripts/run-webkit-tests 2011-07-06 18:58:06 UTC (rev 90476)
@@ -65,6 +65,13 @@
return grep(/(-2|--webkit-test-runner)/, @ARGV);
}
+sub usingLeaks()
+{
+ # NRWT doesn't support --leaks yet.
+ # https://bugs.webkit.org/show_bug.cgi?id=63832
+ return grep(/--leaks/, @ARGV);
+}
+
sub useNewRunWebKitTests()
{
# Change this check to control which platforms use new-run-webkit-tests by default.
@@ -76,7 +83,7 @@
# will remove the --PORT argument from @ARGV, causing us to fail to pass it to the test harness.
# NRWT Windows support still needs work: https://bugs.webkit.org/show_bug.cgi?id=38756
- return ((isLeopard() or isSnowLeopard() or isQt() or isGtk()) and !usingWebKit2());
+ return ((isLeopard() or isSnowLeopard() or isQt() 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
