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 |
11 // with the distribution. | 11 // with the distribution. |
12 // * Neither the name of Google Inc. nor the names of its | 12 // * Neither the name of Google Inc. nor the names of its |
13 // contributors may be used to endorse or promote products derived | 13 // contributors may be used to endorse or promote products derived |
14 // from this software without specific prior written permission. | 14 // from this software without specific prior written permission. |
15 // | 15 // |
16 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | 16 // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
17 // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | 17 // "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
18 // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | 18 // LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
19 // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | 19 // A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
20 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 20 // OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
21 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 21 // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
22 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 22 // LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
23 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 23 // DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
24 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 24 // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
25 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 25 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
26 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 26 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
27 | 27 |
28 #define V8_ALLOW_ACCESS_TO_PERSISTENT_IMPLICIT | |
29 #define V8_ALLOW_ACCESS_TO_PERSISTENT_ARROW | |
30 | |
31 #include <v8.h> | 28 #include <v8.h> |
32 #include "cctest.h" | 29 #include "cctest.h" |
33 #include "debug.h" | 30 #include "debug.h" |
34 | 31 |
35 | 32 |
36 CcTest* CcTest::last_ = NULL; | 33 CcTest* CcTest::last_ = NULL; |
37 | 34 |
38 | 35 |
39 CcTest::CcTest(TestFunction* callback, const char* file, const char* name, | 36 CcTest::CcTest(TestFunction* callback, const char* file, const char* name, |
40 const char* dependency, bool enabled) | 37 const char* dependency, bool enabled) |
(...skipping 22 matching lines...) Expand all Loading... |
63 v8::Persistent<v8::Context> CcTest::context_; | 60 v8::Persistent<v8::Context> CcTest::context_; |
64 | 61 |
65 | 62 |
66 void CcTest::InitializeVM(CcTestExtensionFlags extensions) { | 63 void CcTest::InitializeVM(CcTestExtensionFlags extensions) { |
67 const char* extension_names[kMaxExtensions]; | 64 const char* extension_names[kMaxExtensions]; |
68 int extension_count = 0; | 65 int extension_count = 0; |
69 #define CHECK_EXTENSION_FLAG(Name, Id) \ | 66 #define CHECK_EXTENSION_FLAG(Name, Id) \ |
70 if (extensions.Contains(Name##_ID)) extension_names[extension_count++] = Id; | 67 if (extensions.Contains(Name##_ID)) extension_names[extension_count++] = Id; |
71 EXTENSION_LIST(CHECK_EXTENSION_FLAG) | 68 EXTENSION_LIST(CHECK_EXTENSION_FLAG) |
72 #undef CHECK_EXTENSION_FLAG | 69 #undef CHECK_EXTENSION_FLAG |
| 70 v8::Isolate* isolate = default_isolate(); |
73 if (context_.IsEmpty()) { | 71 if (context_.IsEmpty()) { |
74 v8::Isolate* isolate = default_isolate(); | |
75 v8::HandleScope scope(isolate); | 72 v8::HandleScope scope(isolate); |
76 v8::ExtensionConfiguration config(extension_count, extension_names); | 73 v8::ExtensionConfiguration config(extension_count, extension_names); |
77 v8::Local<v8::Context> context = v8::Context::New(isolate, &config); | 74 v8::Local<v8::Context> context = v8::Context::New(isolate, &config); |
78 context_ = v8::Persistent<v8::Context>::New(isolate, context); | 75 context_.Reset(isolate, context); |
79 } | 76 } |
80 context_->Enter(); | 77 { |
| 78 v8::HandleScope scope(isolate); |
| 79 v8::Local<v8::Context> context = |
| 80 v8::Local<v8::Context>::New(isolate, context_); |
| 81 context->Enter(); |
| 82 } |
81 } | 83 } |
82 | 84 |
83 | 85 |
84 static void PrintTestList(CcTest* current) { | 86 static void PrintTestList(CcTest* current) { |
85 if (current == NULL) return; | 87 if (current == NULL) return; |
86 PrintTestList(current->prev()); | 88 PrintTestList(current->prev()); |
87 if (current->dependency() != NULL) { | 89 if (current->dependency() != NULL) { |
88 printf("%s/%s<%s\n", | 90 printf("%s/%s<%s\n", |
89 current->file(), current->name(), current->dependency()); | 91 current->file(), current->name(), current->dependency()); |
90 } else { | 92 } else { |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
148 } | 150 } |
149 } | 151 } |
150 if (print_run_count && tests_run != 1) | 152 if (print_run_count && tests_run != 1) |
151 printf("Ran %i tests.\n", tests_run); | 153 printf("Ran %i tests.\n", tests_run); |
152 v8::V8::Dispose(); | 154 v8::V8::Dispose(); |
153 return 0; | 155 return 0; |
154 } | 156 } |
155 | 157 |
156 RegisterThreadedTest *RegisterThreadedTest::first_ = NULL; | 158 RegisterThreadedTest *RegisterThreadedTest::first_ = NULL; |
157 int RegisterThreadedTest::count_ = 0; | 159 int RegisterThreadedTest::count_ = 0; |
OLD | NEW |