From 984ae304f2d8f96c27d4810cf736a857e4a49bef Mon Sep 17 00:00:00 2001
From: cjihrig <cjihrig@gmail.com>
Date: Thu, 12 Mar 2020 22:39:12 -0400
Subject: [PATCH] build: make --without-report a no-op

This commit makes the configure --without-report flag a no-op.
This commit also updates a test that depends on the report CLI
flags being conditionally present.

PR-URL: https://github.com/nodejs/node/pull/32242
Fixes: https://github.com/nodejs/node/issues/26293
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: David Carlier <devnexen@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
---
 configure.py                                               | 7 +++----
 .../test-process-env-allowed-flags-are-documented.js       | 2 --
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/configure.py b/configure.py
index 7931c19d8cde3f..704e35d6b6f8c8 100755
--- a/configure.py
+++ b/configure.py
@@ -532,12 +532,12 @@
     dest='without_npm',
     help='do not install the bundled npm (package manager)')
 
+# Dummy option for backwards compatibility
 parser.add_option('--without-report',
     action='store_true',
-    dest='without_report',
-    help='build without report')
+    dest='unused_without_report',
+    help=optparse.SUPPRESS_HELP)
 
-# Dummy option for backwards compatibility
 parser.add_option('--with-snapshot',
     action='store_true',
     dest='unused_with_snapshot',
@@ -1004,7 +1004,6 @@ def configure_node(o):
     o['variables']['OS'] = 'android'
   o['variables']['node_prefix'] = options.prefix
   o['variables']['node_install_npm'] = b(not options.without_npm)
-  o['variables']['node_report'] = b(not options.without_report)
   o['variables']['debug_node'] = b(options.debug_node)
   o['default_configuration'] = 'Debug' if options.debug else 'Release'
 
diff --git a/test/parallel/test-process-env-allowed-flags-are-documented.js b/test/parallel/test-process-env-allowed-flags-are-documented.js
index f356f88fe9c740..01999cc46241c6 100644
--- a/test/parallel/test-process-env-allowed-flags-are-documented.js
+++ b/test/parallel/test-process-env-allowed-flags-are-documented.js
@@ -59,8 +59,6 @@ const conditionalOpts = [
     filter: (opt) => opt === '--icu-data-dir' },
   { include: process.features.inspector,
     filter: (opt) => opt.startsWith('--inspect') || opt === '--debug-port' },
-  { include: process.config.variables.node_report,
-    filter: (opt) => opt.includes('-report') },
 ];
 documented.forEach((opt) => {
   conditionalOpts.forEach(({ include, filter }) => {