summaryrefslogtreecommitdiff
path: root/test/cctest
diff options
context:
space:
mode:
authorBen Noordhuis <info@bnoordhuis.nl>2020-01-07 14:18:56 +0100
committerAnna Henningsen <anna@addaleax.net>2020-01-09 16:50:25 +0100
commit93b0e39ce2bbbf35c0e77e6d4b8e0e2d909d21c4 (patch)
tree3b75465f75ccb99e3d3912f7f1ab87305ec6bd85 /test/cctest
parentaff6fffec584eb08a6a5e774c5b613fcb073c94c (diff)
downloadnode-new-93b0e39ce2bbbf35c0e77e6d4b8e0e2d909d21c4.tar.gz
src: remove uses of node::InitializeV8Platform()
This requires minor changes to src/env.cc to deal with `node::tracing::AgentWriterHandle::GetTracingController()` now possibly returning a nullptr, because the cctest doesn't set one. It seems plausible to me that embedders won't set one either so that seems like an okay change to make. It avoids embedders having to track down nullptr segfaults. PR-URL: https://github.com/nodejs/node/pull/31245 Refs: https://github.com/nodejs/node/pull/31217 Reviewed-By: David Carlier <devnexen@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net>
Diffstat (limited to 'test/cctest')
-rw-r--r--test/cctest/node_test_fixture.h10
1 files changed, 7 insertions, 3 deletions
diff --git a/test/cctest/node_test_fixture.h b/test/cctest/node_test_fixture.h
index 44f4466356..7002f9856d 100644
--- a/test/cctest/node_test_fixture.h
+++ b/test/cctest/node_test_fixture.h
@@ -80,9 +80,13 @@ class NodeZeroIsolateTestFixture : public ::testing::Test {
tracing_agent = std::make_unique<node::tracing::Agent>();
node::tracing::TraceEventHelper::SetAgent(tracing_agent.get());
+ node::tracing::TracingController* tracing_controller =
+ tracing_agent->GetTracingController();
CHECK_EQ(0, uv_loop_init(&current_loop));
- platform.reset(static_cast<node::NodePlatform*>(
- node::InitializeV8Platform(4)));
+ static constexpr int kV8ThreadPoolSize = 4;
+ platform.reset(
+ new node::NodePlatform(kV8ThreadPoolSize, tracing_controller));
+ v8::V8::InitializePlatform(platform.get());
v8::V8::Initialize();
}
@@ -108,7 +112,7 @@ class NodeTestFixture : public NodeZeroIsolateTestFixture {
void SetUp() override {
NodeZeroIsolateTestFixture::SetUp();
- isolate_ = NewIsolate(allocator.get(), &current_loop);
+ isolate_ = NewIsolate(allocator.get(), &current_loop, platform.get());
CHECK_NOT_NULL(isolate_);
isolate_->Enter();
}