Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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: #32242
Fixes: #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>
  • Loading branch information
cjihrig authored and targos committed Apr 28, 2020
1 parent 70eaba1 commit 984ae30
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
7 changes: 3 additions & 4 deletions configure.py
Expand Up @@ -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',
Expand Down Expand Up @@ -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'

Expand Down
Expand Up @@ -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 }) => {
Expand Down

0 comments on commit 984ae30

Please sign in to comment.