2006-02-27 Eric Seidel <eseidel@apple.com>

        Reviewed by ggaren.

        Test new KConfig -> PlugInInfoStore change.
        http://bugzilla.opendarwin.org/show_bug.cgi?id=7498

        * DumpRenderTree/DumpRenderTree.m:
        (main): load test netscape plugin
        * Scripts/run-webkit-tests: style update

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@13021 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index d6c6f2144b56366e3c3032a14dfc501668112826..eaaa082820d2fe6b14d851f6813322d06acc51b9 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2006-02-27  Eric Seidel  <eseidel@apple.com>
+
+        Reviewed by ggaren.
+
+        Test new KConfig -> PlugInInfoStore change.
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=7498
+
+        * DumpRenderTree/DumpRenderTree.m:
+        (main): load test netscape plugin
+        * Scripts/run-webkit-tests: style update
+
 2006-02-24  Eric Seidel  <eseidel@apple.com>
 
         Reviewed by mjs.

diff --git a/WebKitTools/DumpRenderTree/DumpRenderTree.m b/WebKitTools/DumpRenderTree/DumpRenderTree.m
index d7fa52a905c5d61c3449c7d2dd3bfce71a3e00a4..86870cda23c7810f9a80f516001cc7985a915bac 100644 (file)
--- a/WebKitTools/DumpRenderTree/DumpRenderTree.m
+++ b/WebKitTools/DumpRenderTree/DumpRenderTree.m
@@ -36,6 +36,7 @@
 #import <WebKit/WebPreferences.h>
 #import <WebKit/WebView.h>
 #import <WebKit/WebHTMLViewPrivate.h>
+#import <WebKit/WebPluginDatabase.h>
 
 #import <Carbon/Carbon.h>                           // for GetCurrentEventTime()
 #import <ApplicationServices/ApplicationServices.h> // for CMSetDefaultProfileBySpace
@@ -229,6 +230,10 @@ int main(int argc, const char *argv[])
     [webView setEditingDelegate:editingDelegate];
     [webView setUIDelegate:delegate];
     frame = [webView mainFrame];
+    
+    NSString *pwd = [[NSString stringWithCString:argv[0]] stringByDeletingLastPathComponent];
+    [WebPluginDatabase setAdditionalWebPlugInPaths:[NSArray arrayWithObject:pwd]];
+    [[WebPluginDatabase installedPlugins] refresh];
 
     // The back/forward cache is causing problems due to layouts during transition from one page to another.
     // So, turn it off for now, but we might want to turn it back on some day.

diff --git a/WebKitTools/Scripts/run-webkit-tests b/WebKitTools/Scripts/run-webkit-tests
index d5d2e890a692f9eeb342da31d2c398eee3293eb0..04ef010c1c817ecff2aee6cfea7ce8f100a499a0 100755 (executable)
--- a/WebKitTools/Scripts/run-webkit-tests
+++ b/WebKitTools/Scripts/run-webkit-tests
@@ -687,7 +687,7 @@ sub countAndPrintLeaks
     my $adjustedCount = $count;
     $adjustedCount -= $excluded if $excluded;
 
-    if ($adjustedCount == 0) {
+    if (!$adjustedCount) {
         print " - no leaks found\n";
         unlink $leaksFilePath;
         return 0;