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

cli: fix flags on help output

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/22271
Reviewed-By: Tiancheng "Timothy" Gu <timothygu99@gmail.com>
This commit is contained in:
Gus Caplan 2018-08-11 15:06:06 -05:00
parent 88105c998e
commit be9f7860e1
No known key found for this signature in database
GPG Key ID: F00BD11880E82F0E
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/node.cc
View File

@ -2591,16 +2591,12 @@ static void PrintHelp() {
#if HAVE_OPENSSL && NODE_FIPS_MODE #if HAVE_OPENSSL && NODE_FIPS_MODE
" --enable-fips enable FIPS crypto at startup\n" " --enable-fips enable FIPS crypto at startup\n"
#endif // NODE_FIPS_MODE && NODE_FIPS_MODE #endif // NODE_FIPS_MODE && NODE_FIPS_MODE
#if defined(NODE_HAVE_I18N_SUPPORT)
" --experimental-modules experimental ES Module support\n" " --experimental-modules experimental ES Module support\n"
" and caching modules\n" " and caching modules\n"
#endif // defined(NODE_HAVE_I18N_SUPPORT)
" --experimental-repl-await experimental await keyword support\n" " --experimental-repl-await experimental await keyword support\n"
" in REPL\n" " in REPL\n"
#if defined(NODE_HAVE_I18N_SUPPORT)
" --experimental-vm-modules experimental ES Module support\n" " --experimental-vm-modules experimental ES Module support\n"
" in vm module\n" " in vm module\n"
#endif // defined(NODE_HAVE_I18N_SUPPORT)
" --experimental-worker experimental threaded Worker support\n" " --experimental-worker experimental threaded Worker support\n"
#if HAVE_OPENSSL && NODE_FIPS_MODE #if HAVE_OPENSSL && NODE_FIPS_MODE
" --force-fips force FIPS crypto (cannot be disabled)\n" " --force-fips force FIPS crypto (cannot be disabled)\n"
@ -2633,11 +2629,9 @@ static void PrintHelp() {
" OPENSSL_CONF)\n" " OPENSSL_CONF)\n"
#endif // HAVE_OPENSSL #endif // HAVE_OPENSSL
" --pending-deprecation emit pending deprecation warnings\n" " --pending-deprecation emit pending deprecation warnings\n"
#if defined(NODE_HAVE_I18N_SUPPORT)
" --preserve-symlinks preserve symbolic links when resolving\n" " --preserve-symlinks preserve symbolic links when resolving\n"
" --preserve-symlinks-main preserve symbolic links when resolving\n" " --preserve-symlinks-main preserve symbolic links when resolving\n"
" the main module\n" " the main module\n"
#endif
" --prof generate V8 profiler output\n" " --prof generate V8 profiler output\n"
" --prof-process process V8 profiler output generated\n" " --prof-process process V8 profiler output generated\n"
" using --prof\n" " using --prof\n"
@ -2718,10 +2712,8 @@ static void PrintHelp() {
" prefixed to the module search path\n" " prefixed to the module search path\n"
"NODE_PENDING_DEPRECATION set to 1 to emit pending deprecation\n" "NODE_PENDING_DEPRECATION set to 1 to emit pending deprecation\n"
" warnings\n" " warnings\n"
#if defined(NODE_HAVE_I18N_SUPPORT)
"NODE_PRESERVE_SYMLINKS set to 1 to preserve symbolic links\n" "NODE_PRESERVE_SYMLINKS set to 1 to preserve symbolic links\n"
" when resolving and caching modules\n" " when resolving and caching modules\n"
#endif
"NODE_REDIRECT_WARNINGS write warnings to path instead of\n" "NODE_REDIRECT_WARNINGS write warnings to path instead of\n"
" stderr\n" " stderr\n"
"NODE_REPL_HISTORY path to the persistent REPL history\n" "NODE_REPL_HISTORY path to the persistent REPL history\n"

4
test/parallel/test-cli-node-print-help.js
View File

@ -32,9 +32,7 @@ function validateNodePrintHelp() {
{ compileConstant: NODE_FIPS_MODE, { compileConstant: NODE_FIPS_MODE,
flags: [ '--enable-fips', '--force-fips' ] }, flags: [ '--enable-fips', '--force-fips' ] },
{ compileConstant: NODE_HAVE_I18N_SUPPORT, { compileConstant: NODE_HAVE_I18N_SUPPORT,
flags: [ '--experimental-modules', '--experimental-vm-modules', flags: [ '--icu-data-dir=dir', 'NODE_ICU_DATA' ] },
'--icu-data-dir=dir', '--preserve-symlinks',
'NODE_ICU_DATA', 'NODE_PRESERVE_SYMLINKS' ] },
{ compileConstant: HAVE_INSPECTOR, { compileConstant: HAVE_INSPECTOR,
flags: [ '--inspect-brk[=[host:]port]', '--inspect-port=[host:]port', flags: [ '--inspect-brk[=[host:]port]', '--inspect-port=[host:]port',
'--inspect[=[host:]port]' ] }, '--inspect[=[host:]port]' ] },