1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: make --without-report a no-op

Browse Source 
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>
This commit is contained in:
cjihrig 2020-03-12 22:39:12 -04:00
parent f1d3d927e1
commit 765c3759ef
No known key found for this signature in database
GPG Key ID: 7434390BDBE9B9C5
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.py
View File

@ -538,12 +538,12 @@ parser.add_option('--without-npm',
dest='without_npm', dest='without_npm',
help='do not install the bundled npm (package manager)') help='do not install the bundled npm (package manager)')
# Dummy option for backwards compatibility
parser.add_option('--without-report', parser.add_option('--without-report',
action='store_true', action='store_true',
dest='without_report', dest='unused_without_report',
help='build without report') help=optparse.SUPPRESS_HELP)
# Dummy option for backwards compatibility
parser.add_option('--with-snapshot', parser.add_option('--with-snapshot',
action='store_true', action='store_true',
dest='unused_with_snapshot', dest='unused_with_snapshot',
@ -1004,7 +1004,6 @@ def configure_node(o):
o['variables']['OS'] = 'android' o['variables']['OS'] = 'android'
o['variables']['node_prefix'] = options.prefix o['variables']['node_prefix'] = options.prefix
o['variables']['node_install_npm'] = b(not options.without_npm) 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['variables']['debug_node'] = b(options.debug_node)
o['default_configuration'] = 'Debug' if options.debug else 'Release' o['default_configuration'] = 'Debug' if options.debug else 'Release'

2
test/parallel/test-process-env-allowed-flags-are-documented.js
View File

@ -59,8 +59,6 @@ const conditionalOpts = [
filter: (opt) => opt === '--icu-data-dir' }, filter: (opt) => opt === '--icu-data-dir' },
{ include: process.features.inspector, { include: process.features.inspector,
filter: (opt) => opt.startsWith('--inspect') || opt === '--debug-port' }, filter: (opt) => opt.startsWith('--inspect') || opt === '--debug-port' },
{ include: process.config.variables.node_report,
filter: (opt) => opt.includes('-report') },
]; ];
documented.forEach((opt) => { documented.forEach((opt) => {
conditionalOpts.forEach(({ include, filter }) => { conditionalOpts.forEach(({ include, filter }) => {