remove remaining uses of default isolate in tests

test/cctest/cctest.cc

 // Copyright 2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 13 matching lines @@
 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <v8.h>
 #include "cctest.h"
 #include "debug.h"
 
 enum InitializationState {kUnset, kUnintialized, kInitialized};
 static InitializationState initialization_state_  = kUnset;
+static bool disable_automatic_dispose_ = false;
 
 CcTest* CcTest::last_ = NULL;
 bool CcTest::initialize_called_ = false;
 bool CcTest::isolate_used_ = false;
 v8::Isolate* CcTest::isolate_ = NULL;
 
 
 CcTest::CcTest(TestFunction* callback, const char* file, const char* name,
                const char* dependency, bool enabled, bool initialize)
     : callback_(callback), name_(name), dependency_(dependency),
@@ skipping 15 matching lines @@
   file_ = basename;
   prev_ = last_;
   last_ = this;
 }
 
 
 void CcTest::Run() {
   if (!initialize_) {
     CHECK(initialization_state_ != kInitialized);
     initialization_state_ = kUnintialized;
-    // TODO(dcarney): Remove this when default isolate is gone.
-    if (isolate_ == NULL) {
-      isolate_ = v8::Isolate::GetCurrent();
-    }
+    CHECK(CcTest::isolate_ == NULL);
   } else {
     CHECK(initialization_state_ != kUnintialized);
     initialization_state_ = kInitialized;
-    i::Isolate::SetCrashIfDefaultIsolateInitialized();
     if (isolate_ == NULL) {
       isolate_ = v8::Isolate::New();
     }
     isolate_->Enter();
   }
   callback_();
   if (initialize_) {
     isolate_->Exit();
   }
 }
 
 
 v8::Local<v8::Context> CcTest::NewContext(CcTestExtensionFlags extensions,
                                           v8::Isolate* isolate) {
     const char* extension_names[kMaxExtensions];
     int extension_count = 0;
   #define CHECK_EXTENSION_FLAG(Name, Id) \
     if (extensions.Contains(Name##_ID)) extension_names[extension_count++] = Id;
     EXTENSION_LIST(CHECK_EXTENSION_FLAG)
   #undef CHECK_EXTENSION_FLAG
     v8::ExtensionConfiguration config(extension_count, extension_names);
     v8::Local<v8::Context> context = v8::Context::New(isolate, &config);
     CHECK(!context.IsEmpty());
     return context;
 }
 
 
+void CcTest::DisableAutomaticDispose() {
+  CHECK_EQ(kUnintialized, initialization_state_);
+  disable_automatic_dispose_ = true;
+}
+
+
 static void PrintTestList(CcTest* current) {
   if (current == NULL) return;
   PrintTestList(current->prev());
   if (current->dependency() != NULL) {
     printf("%s/%s<%s\n",
            current->file(), current->name(), current->dependency());
   } else {
     printf("%s/%s<\n", current->file(), current->name());
   }
 }
@@ skipping 10 matching lines @@
 
 static void SuggestTestHarness(int tests) {
   if (tests == 0) return;
   printf("Running multiple tests in sequence is deprecated and may cause "
          "bogus failure.  Consider using tools/run-tests.py instead.\n");
 }
 
 
 int main(int argc, char* argv[]) {
   v8::V8::InitializeICU();
+  i::Isolate::SetCrashIfDefaultIsolateInitialized();
 
   v8::internal::FlagList::SetFlagsFromCommandLine(&argc, argv, true);
 
   CcTestArrayBufferAllocator array_buffer_allocator;
   v8::V8::SetArrayBufferAllocator(&array_buffer_allocator);
 
   int tests_run = 0;
   bool print_run_count = true;
   for (int i = 1; i < argc; i++) {
     char* arg = argv[i];
@@ skipping 33 matching lines @@
             test->Run();
           }
           test = test->prev();
         }
       }
       v8::internal::DeleteArray<char>(arg_copy);
     }
   }
   if (print_run_count && tests_run != 1)
     printf("Ran %i tests.\n", tests_run);
-  v8::V8::Dispose();
+  if (!disable_automatic_dispose_) v8::V8::Dispose();
   return 0;
 }
 
 RegisterThreadedTest *RegisterThreadedTest::first_ = NULL;
 int RegisterThreadedTest::count_ = 0;