Changeset 84534 in webkit

Timestamp:

Apr 21, 2011 12:08:53 PM (13 years ago)

Author:

weinig@apple.com

Message:

2011-04-21 Sam Weinig <​sam@webkit.org>

Reviewed by Simon Fraser.

Add way to garbage collect between each test when running layout tests
​https://bugs.webkit.org/show_bug.cgi?id=59126

• DumpRenderTree/mac/DumpRenderTree.mm: (initializeGlobalsFromCommandLineOptions): (runTest):
• Scripts/old-run-webkit-tests:
• WebKitTestRunner/InjectedBundle/InjectedBundle.cpp: (WTR::InjectedBundle::didReceiveMessage):
• WebKitTestRunner/TestController.cpp: (WTR::TestController::TestController): (WTR::TestController::initialize): (WTR::TestController::resetStateToConsistentValues):
• WebKitTestRunner/TestController.h:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/mac/DumpRenderTree.mm (modified) (3 diffs)
• Scripts/old-run-webkit-tests (modified) (4 diffs)
• WebKitTestRunner/InjectedBundle/InjectedBundle.cpp (modified) (1 diff)
• WebKitTestRunner/TestController.cpp (modified) (4 diffs)
• WebKitTestRunner/TestController.h (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-21  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Simon Fraser.
+
+        Add way to garbage collect between each test when running layout tests
+        https://bugs.webkit.org/show_bug.cgi?id=59126
+
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        (initializeGlobalsFromCommandLineOptions):
+        (runTest):
+        * Scripts/old-run-webkit-tests:
+        * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
+        (WTR::InjectedBundle::didReceiveMessage):
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::TestController::TestController):
+        (WTR::TestController::initialize):
+        (WTR::TestController::resetStateToConsistentValues):
+        * WebKitTestRunner/TestController.h:
+
 2011-04-21  Ojan Vafai  <ojan@chromium.org>
 

trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm

@@ -143 +143 @@
 static int dumpTree = YES;
 static int forceComplexText;
+static int gcBetweenTests;
 static BOOL printSeparators;
 static RetainPtr<CFStringRef> persistentUserStyleSheetLocation;
@@ -587 +588 @@
         {"threaded", no_argument, &threaded, YES},
         {"complex-text", no_argument, &forceComplexText, YES},
+        {"gc-between-tests", no_argument, &gcBetweenTests, YES},
         {NULL, 0, NULL, 0}
     };
@@ -1203 +1205 @@
     if (ignoreWebCoreNodeLeaks)
         [WebCoreStatistics stopIgnoringWebCoreNodeLeaks];
+
+    if (gcBetweenTests)
+        [WebCoreStatistics garbageCollectJavaScriptObjects];
 }
 

trunk/Tools/Scripts/old-run-webkit-tests

@@ -167 +167 @@
 my $testsPerDumpTool = 1000;
 my $threaded = 0;
+my $gcBetweenTests = 0;
 # DumpRenderTree has an internal timeout of 30 seconds, so this must be > 30.
 my $timeoutSeconds = 35;
@@ -282 +283 @@
   --complex-text                  Use the complex text code path for all text (Mac OS X and Windows only)
   -c|--configuration config       Set DumpRenderTree build configuration
+  --gc-between-tests              Force garbage collection between each test
   -g|--guard-malloc               Enable malloc guard
   --exit-after-n-failures N       Exit after the first N failures (includes crashes) instead of running all tests
@@ -332 +334 @@
     'exit-after-n-failures=i' => \$exitAfterNFailures,
     'exit-after-n-crashes-or-timeouts=i' => \$exitAfterNCrashesOrTimeouts,
+    'gc-between-tests' => \$gcBetweenTests,
     'guard-malloc|g' => \$guardMalloc,
     'help|h' => \$showHelp,
@@ -644 +647 @@
 push @toolArgs, "--threaded" if $threaded;
 push @toolArgs, "--complex-text" if $complexText;
+push @toolArgs, "--gc-between-tests" if $gcBetweenTests;
 push @toolArgs, "-";
 

trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp

@@ -142 +142 @@
         return;
     } else if (WKStringIsEqualToUTF8CString(messageName, "Reset")) {
+        ASSERT(messageBody);
+        ASSERT(WKGetTypeID(messageBody) == WKDictionaryGetTypeID());
+        WKDictionaryRef messageBodyDictionary = static_cast<WKDictionaryRef>(messageBody);
+
+        WKRetainPtr<WKStringRef> shouldGCKey(AdoptWK, WKStringCreateWithUTF8CString("ShouldGC"));
+        bool shouldGC = WKBooleanGetValue(static_cast<WKBooleanRef>(WKDictionaryGetItemForKey(messageBodyDictionary, shouldGCKey.get())));
+
+        if (shouldGC)
+            WKBundleGarbageCollectJavaScriptObjects(m_bundle);
+
         m_state = Idle;
         m_dumpPixels = false;

trunk/Tools/WebKitTestRunner/TestController.cpp

@@ -30 +30 @@
 #include "StringFunctions.h"
 #include "TestInvocation.h"
-#include <cstdio>
 #include <WebKit2/WKContextPrivate.h>
+#include <WebKit2/WKNumber.h>
 #include <WebKit2/WKPageGroup.h>
 #include <WebKit2/WKPreferencesPrivate.h>
 #include <WebKit2/WKRetainPtr.h>
+#include <cstdio>
 #include <wtf/PassOwnPtr.h>
 
@@ -61 +62 @@
     , m_printSeparators(false)
     , m_usingServerMode(false)
+    , m_gcBetweenTests(false)
     , m_state(Initial)
     , m_doneResetting(false)
@@ -216 +218 @@
             continue;
         }
+        if (argument == "--gc-between-tests") {
+            m_gcBetweenTests = true;
+            continue;
+        }
         if (argument == "--print-supported-features") {
             printSupportedFeatures = true;
@@ -349 +355 @@
     m_state = Resetting;
 
-    WKRetainPtr<WKStringRef> messageName(AdoptWK, WKStringCreateWithUTF8CString("Reset"));
-    WKContextPostMessageToInjectedBundle(TestController::shared().context(), messageName.get(), 0);
+    WKRetainPtr<WKStringRef> messageName = adoptWK(WKStringCreateWithUTF8CString("Reset"));
+    WKRetainPtr<WKMutableDictionaryRef> resetMessageBody = adoptWK(WKMutableDictionaryCreate());
+
+    WKRetainPtr<WKStringRef> shouldGCKey = adoptWK(WKStringCreateWithUTF8CString("ShouldGC"));
+    WKRetainPtr<WKBooleanRef> shouldGCValue = adoptWK(WKBooleanCreate(m_gcBetweenTests));
+    WKDictionaryAddItem(resetMessageBody.get(), shouldGCKey.get(), shouldGCValue.get());
+
+    WKContextPostMessageToInjectedBundle(TestController::shared().context(), messageName.get(), resetMessageBody.get());
 
     // FIXME: This function should also ensure that there is only one page open.

trunk/Tools/WebKitTestRunner/TestController.h

@@ -100 +100 @@
     bool m_printSeparators;
     bool m_usingServerMode;
+    bool m_gcBetweenTests;
     std::vector<std::string> m_paths;
     WKRetainPtr<WKStringRef> m_injectedBundlePath;