From c5725f84cb0b5b5f04159da5d3801a894ae73459 Mon Sep 17 00:00:00 2001
From: Anna Henningsen <anna@addaleax.net>
Date: Wed, 25 Oct 2017 19:51:58 +0200
Subject: [PATCH] cli: add --stack-trace-limit to NODE_OPTIONS

I decided that it would make a lot of sense for me to set
`NODE_OPTIONS=--stack-trace-limit=100` on my development machine.

This code allows me to do that. :)
---
 doc/api/cli.md                         |  1 +
 src/node.cc                            |  1 +
 test/parallel/test-cli-node-options.js | 20 +++++++++++++++-----
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/doc/api/cli.md b/doc/api/cli.md
index b6d778f5ac484d..b5c52ebfd304be 100644
--- a/doc/api/cli.md
+++ b/doc/api/cli.md
@@ -471,6 +471,7 @@ Node options that are allowed are:
 V8 options that are allowed are:
 - `--abort-on-uncaught-exception`
 - `--max-old-space-size`
+- `--stack-trace-limit`
 
 ### `NODE_PENDING_DEPRECATION=1`
 <!-- YAML
diff --git a/src/node.cc b/src/node.cc
index b780d526531d7a..e9096ecd818d06 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -4043,6 +4043,7 @@ static void CheckIfAllowedInEnv(const char* exe, bool is_env,
     // V8 options (define with '_', which allows '-' or '_')
     "--abort_on_uncaught_exception",
     "--max_old_space_size",
+    "--stack_trace_limit",
   };
 
   for (unsigned i = 0; i < arraysize(whitelist); i++) {
diff --git a/test/parallel/test-cli-node-options.js b/test/parallel/test-cli-node-options.js
index 94cf6ca5fbcdab..07c99a57c667cf 100644
--- a/test/parallel/test-cli-node-options.js
+++ b/test/parallel/test-cli-node-options.js
@@ -33,16 +33,26 @@ if (common.hasCrypto) {
 // V8 options
 expect('--abort_on-uncaught_exception', 'B\n');
 expect('--max-old-space-size=0', 'B\n');
+expect('--stack-trace-limit=100',
+       /(\s*at f \(\[eval\]:1:\d*\)\n){100}/,
+       '(function f() { f(); })();',
+       true);
 
-function expect(opt, want) {
-  const argv = ['-e', 'console.log("B")'];
+function expect(opt, want, command = 'console.log("B")', wantsError = false) {
+  const argv = ['-e', command];
   const opts = {
     env: Object.assign({}, process.env, { NODE_OPTIONS: opt }),
     maxBuffer: 1e6,
   };
-  exec(process.execPath, argv, opts, common.mustCall((err, stdout) => {
-    assert.ifError(err);
-    if (stdout.includes(want)) return;
+  if (typeof want === 'string')
+    want = new RegExp(want);
+  exec(process.execPath, argv, opts, common.mustCall((err, stdout, stderr) => {
+    if (wantsError) {
+      stdout = stderr;
+    } else {
+      assert.ifError(err);
+    }
+    if (want.test(stdout)) return;
 
     const o = JSON.stringify(opt);
     assert.fail(`For ${o}, failed to find ${want} in: <\n${stdout}\n>`);