From bdf6d41c72740121cbab4180d27ee22b208528f4 Mon Sep 17 00:00:00 2001
From: Anna Henningsen <anna@addaleax.net>
Date: Sat, 21 Mar 2020 11:25:14 +0100
Subject: [PATCH] test: use InitializeNodeWithArgs in cctest
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Refs: https://github.com/nodejs/node/commit/d7f11077f15f52a2db191d3a5bcc41581cb7361f
Fixes: https://github.com/nodejs/node/issues/30257

Backport-PR-URL: https://github.com/nodejs/node/pull/35241
PR-URL: https://github.com/nodejs/node/pull/32406
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Matheus Marchini <mat@mmarchini.me>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
---
 test/cctest/node_test_fixture.h | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/test/cctest/node_test_fixture.h b/test/cctest/node_test_fixture.h
index 291bc5962bed77..2f7ab06c14334f 100644
--- a/test/cctest/node_test_fixture.h
+++ b/test/cctest/node_test_fixture.h
@@ -73,11 +73,13 @@ class NodeTestFixture : public ::testing::Test {
     if (!node_initialized) {
       uv_os_unsetenv("NODE_OPTIONS");
       node_initialized = true;
-      int argc = 1;
-      const char* argv0 = "cctest";
-      int exec_argc;
-      const char** exec_argv;
-      node::Init(&argc, &argv0, &exec_argc, &exec_argv);
+      std::vector<std::string> argv { "cctest" };
+      std::vector<std::string> exec_argv;
+      std::vector<std::string> errors;
+
+      int exitcode = node::InitializeNodeWithArgs(&argv, &exec_argv, &errors);
+      CHECK_EQ(exitcode, 0);
+      CHECK(errors.empty());
     }
 
     tracing_agent = std::make_unique<node::tracing::Agent>();