Changeset 13861 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Apr 13, 2006, 3:33:16 AM (19 years ago)

Author:

mjs

Message:

Reviewed by Geoff.

• fix testkjs to not show false-positive KJS::Node leaks in debug builds

• kjs/testkjs.cpp: (doIt): (kjsmain):

File:

• trunk/JavaScriptCore/kjs/testkjs.cpp (modified) (4 diffs)

trunk/JavaScriptCore/kjs/testkjs.cpp

@@ -24 +24 @@
 
 #include "config.h"
+#include "collector.h"
 
 #include "HashTraits.h"
@@ -35 +36 @@
 #include <sys/time.h>
 #endif
+
+#include "protect.h"
 
 #if PLATFORM(WIN_OS)
@@ -193 +196 @@
 }
 
+
+bool doIt(int argc, char** argv)
+{
+  bool success = true;
+  GlobalImp* global = new GlobalImp();
+
+  // create interpreter
+  Interpreter interp(global);
+  // add debug() function
+  global->put(interp.globalExec(), "debug", new TestFunctionImp(TestFunctionImp::Debug, 1));
+  // add "print" for compatibility with the mozilla js shell
+  global->put(interp.globalExec(), "print", new TestFunctionImp(TestFunctionImp::Print, 1));
+  // add "quit" for compatibility with the mozilla js shell
+  global->put(interp.globalExec(), "quit", new TestFunctionImp(TestFunctionImp::Quit, 0));
+  // add "gc" for compatibility with the mozilla js shell
+  global->put(interp.globalExec(), "gc", new TestFunctionImp(TestFunctionImp::GC, 0));
+  // add "version" for compatibility with the mozilla js shell 
+  global->put(interp.globalExec(), "version", new TestFunctionImp(TestFunctionImp::Version, 1));
+  global->put(interp.globalExec(), "run", new TestFunctionImp(TestFunctionImp::Run, 1));
+  
+  Interpreter::setShouldPrintExceptions(true);
+  
+  for (int i = 1; i < argc; i++) {
+    const char* fileName = argv[i];
+    if (strcmp(fileName, "-f") == 0) // mozilla test driver script uses "-f" prefix for files
+      continue;
+    
+    char* script = createStringWithContentsOfFile(fileName);
+    if (!script) {
+      success = false;
+      break; // fail early so we can catch missing files
+    }
+    
+    Completion completion = interp.evaluate(fileName, 0, script);
+    success = success && completion.complType() != Throw;
+    free(script);
+  }
+
+  return success;
+}
+
+
 int kjsmain(int argc, char** argv)
 {
@@ -202 +247 @@
   testIsInteger();
 
-  bool success = true;
-  {
-    JSLock lock;
-    
-    GlobalImp* global = new GlobalImp();
-
-    // create interpreter
-    Interpreter interp(global);
-    // add debug() function
-    global->put(interp.globalExec(), "debug", new TestFunctionImp(TestFunctionImp::Debug, 1));
-    // add "print" for compatibility with the mozilla js shell
-    global->put(interp.globalExec(), "print", new TestFunctionImp(TestFunctionImp::Print, 1));
-    // add "quit" for compatibility with the mozilla js shell
-    global->put(interp.globalExec(), "quit", new TestFunctionImp(TestFunctionImp::Quit, 0));
-    // add "gc" for compatibility with the mozilla js shell
-    global->put(interp.globalExec(), "gc", new TestFunctionImp(TestFunctionImp::GC, 0));
-    // add "version" for compatibility with the mozilla js shell 
-    global->put(interp.globalExec(), "version", new TestFunctionImp(TestFunctionImp::Version, 1));
-    global->put(interp.globalExec(), "run", new TestFunctionImp(TestFunctionImp::Run, 1));
-
-    Interpreter::setShouldPrintExceptions(true);
-    
-    for (int i = 1; i < argc; i++) {
-      const char* fileName = argv[i];
-      if (strcmp(fileName, "-f") == 0) // mozilla test driver script uses "-f" prefix for files
-        continue;
-      
-      char* script = createStringWithContentsOfFile(fileName);
-      if (!script) {
-        success = false;
-        break; // fail early so we can catch missing files
-      }
-
-      Completion completion = interp.evaluate(fileName, 0, script);
-      success = success && completion.complType() != Throw;
-      free(script);
-    }
-    
-    delete global;
-  } // end block, so that interpreter gets deleted
+  JSLock lock;
+
+  bool success = doIt(argc, argv);
+
+#ifndef NDEBUG
+  Collector::collect();
+#endif
 
   if (success)