OLD | NEW |
1 // Copyright 2008 the V8 project authors. All rights reserved. | 1 // Copyright 2008 the V8 project authors. All rights reserved. |
2 // Redistribution and use in source and binary forms, with or without | 2 // Redistribution and use in source and binary forms, with or without |
3 // modification, are permitted provided that the following conditions are | 3 // modification, are permitted provided that the following conditions are |
4 // met: | 4 // met: |
5 // | 5 // |
6 // * Redistributions of source code must retain the above copyright | 6 // * Redistributions of source code must retain the above copyright |
7 // notice, this list of conditions and the following disclaimer. | 7 // notice, this list of conditions and the following disclaimer. |
8 // * Redistributions in binary form must reproduce the above | 8 // * Redistributions in binary form must reproduce the above |
9 // copyright notice, this list of conditions and the following | 9 // copyright notice, this list of conditions and the following |
10 // disclaimer in the documentation and/or other materials provided | 10 // disclaimer in the documentation and/or other materials provided |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
61 | 61 |
62 | 62 |
63 void CcTest::InitializeVM(CcTestExtensionFlags extensions) { | 63 void CcTest::InitializeVM(CcTestExtensionFlags extensions) { |
64 const char* extension_names[kMaxExtensions]; | 64 const char* extension_names[kMaxExtensions]; |
65 int extension_count = 0; | 65 int extension_count = 0; |
66 #define CHECK_EXTENSION_FLAG(Name, Id) \ | 66 #define CHECK_EXTENSION_FLAG(Name, Id) \ |
67 if (extensions.Contains(Name##_ID)) extension_names[extension_count++] = Id; | 67 if (extensions.Contains(Name##_ID)) extension_names[extension_count++] = Id; |
68 EXTENSION_LIST(CHECK_EXTENSION_FLAG) | 68 EXTENSION_LIST(CHECK_EXTENSION_FLAG) |
69 #undef CHECK_EXTENSION_FLAG | 69 #undef CHECK_EXTENSION_FLAG |
70 if (context_.IsEmpty()) { | 70 if (context_.IsEmpty()) { |
| 71 v8::Isolate* isolate = default_isolate(); |
| 72 v8::HandleScope scope(isolate); |
71 v8::ExtensionConfiguration config(extension_count, extension_names); | 73 v8::ExtensionConfiguration config(extension_count, extension_names); |
72 context_ = v8::Context::New(&config); | 74 v8::Local<v8::Context> context = v8::Context::New(isolate, &config); |
| 75 context_ = v8::Persistent<v8::Context>::New(isolate, context); |
73 } | 76 } |
74 context_->Enter(); | 77 context_->Enter(); |
75 } | 78 } |
76 | 79 |
77 | 80 |
78 static void PrintTestList(CcTest* current) { | 81 static void PrintTestList(CcTest* current) { |
79 if (current == NULL) return; | 82 if (current == NULL) return; |
80 PrintTestList(current->prev()); | 83 PrintTestList(current->prev()); |
81 if (current->dependency() != NULL) { | 84 if (current->dependency() != NULL) { |
82 printf("%s/%s<%s\n", | 85 printf("%s/%s<%s\n", |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
140 } | 143 } |
141 } | 144 } |
142 if (print_run_count && tests_run != 1) | 145 if (print_run_count && tests_run != 1) |
143 printf("Ran %i tests.\n", tests_run); | 146 printf("Ran %i tests.\n", tests_run); |
144 v8::V8::Dispose(); | 147 v8::V8::Dispose(); |
145 return 0; | 148 return 0; |
146 } | 149 } |
147 | 150 |
148 RegisterThreadedTest *RegisterThreadedTest::first_ = NULL; | 151 RegisterThreadedTest *RegisterThreadedTest::first_ = NULL; |
149 int RegisterThreadedTest::count_ = 0; | 152 int RegisterThreadedTest::count_ = 0; |
OLD | NEW |