Skip to content

src: initialize inspector before RunBootstrapping() #32672

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

src: initialize inspector before RunBootstrapping() #32672

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4ce0133
src: initialize inspector before RunBootstrapping()
addaleax Apr 5, 2020
9cf8279
fixup! src: initialize inspector before RunBootstrapping()
addaleax Apr 5, 2020
8d2a588
fixup! src: initialize inspector before RunBootstrapping()
addaleax Apr 5, 2020
0ce07e3
fixup! src: initialize inspector before RunBootstrapping()
addaleax Apr 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixup! src: initialize inspector before RunBootstrapping()
  • Loading branch information
@addaleax
addaleax committed Apr 5, 2020
commit 8d2a588ee466a2e12c3f612426ec3ce6d153ad2e
12 changes: 9 additions & 3 deletions test/cctest/node_test_fixture.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,10 @@ class EnvironmentTestFixture : public NodeTestFixture {
public:
class Env {
public:
Env(const v8::HandleScope& handle_scope, const Argv& argv) {
Env(const v8::HandleScope& handle_scope,
const Argv& argv,
node::EnvironmentFlags::Flags flags =
node::EnvironmentFlags::kDefaultFlags) {
auto isolate = handle_scope.GetIsolate();
context_ = node::NewContext(isolate);
CHECK(!context_.IsEmpty());
Expand All @@ -145,10 +148,13 @@ class EnvironmentTestFixture : public NodeTestFixture {
&NodeTestFixture::current_loop,
platform.get());
CHECK_NE(nullptr, isolate_data_);
std::vector<std::string> args(*argv, *argv + 1);
std::vector<std::string> exec_args(*argv, *argv + 1);
environment_ = node::CreateEnvironment(isolate_data_,
context_,
1, *argv,
argv.nr_args(), *argv);
args,
exec_args,
flags);
CHECK_NE(nullptr, environment_);
}

Expand Down
3 changes: 2 additions & 1 deletion test/cctest/test_environment.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,9 @@ TEST_F(EnvironmentTest, AtExitRunsJS) {
TEST_F(EnvironmentTest, MultipleEnvironmentsPerIsolate) {
const v8::HandleScope handle_scope(isolate_);
const Argv argv;
// Only one of the Environments can have default flags and own the inspector.
Env env1 {handle_scope, argv};
Env env2 {handle_scope, argv};
Env env2 {handle_scope, argv, node::EnvironmentFlags::kNoFlags};

AtExit(*env1, at_exit_callback1);
AtExit(*env2, at_exit_callback2);
Expand Down