cli: fix flags on help output

PR-URL: #22271 Reviewed-By: Tiancheng "Timothy" Gu <[email protected]>
nodejs · Sep 3, 2018 · dec42b5 · dec42b5
1 parent 7972298
commit dec42b5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/src/node.cc b/src/node.cc
@@ -2592,16 +2592,12 @@ static void PrintHelp() {
 #if HAVE_OPENSSL && NODE_FIPS_MODE
          "  --enable-fips              enable FIPS crypto at startup\n"
 #endif  // NODE_FIPS_MODE && NODE_FIPS_MODE
-#if defined(NODE_HAVE_I18N_SUPPORT)
          "  --experimental-modules     experimental ES Module support\n"
          "                             and caching modules\n"
-#endif  // defined(NODE_HAVE_I18N_SUPPORT)
          "  --experimental-repl-await  experimental await keyword support\n"
          "                             in REPL\n"
-#if defined(NODE_HAVE_I18N_SUPPORT)
          "  --experimental-vm-modules  experimental ES Module support\n"
          "                             in vm module\n"
-#endif  // defined(NODE_HAVE_I18N_SUPPORT)
          "  --experimental-worker      experimental threaded Worker support\n"
 #if HAVE_OPENSSL && NODE_FIPS_MODE
          "  --force-fips               force FIPS crypto (cannot be disabled)\n"
@@ -2634,11 +2630,9 @@ static void PrintHelp() {
          "                             OPENSSL_CONF)\n"
 #endif  // HAVE_OPENSSL
          "  --pending-deprecation      emit pending deprecation warnings\n"
-#if defined(NODE_HAVE_I18N_SUPPORT)
          "  --preserve-symlinks        preserve symbolic links when resolving\n"
          "  --preserve-symlinks-main   preserve symbolic links when resolving\n"
          "                             the main module\n"
-#endif
          "  --prof                     generate V8 profiler output\n"
          "  --prof-process             process V8 profiler output generated\n"
          "                             using --prof\n"
@@ -2719,10 +2713,8 @@ static void PrintHelp() {
          "                             prefixed to the module search path\n"
          "NODE_PENDING_DEPRECATION     set to 1 to emit pending deprecation\n"
          "                             warnings\n"
-#if defined(NODE_HAVE_I18N_SUPPORT)
          "NODE_PRESERVE_SYMLINKS       set to 1 to preserve symbolic links\n"
          "                             when resolving and caching modules\n"
-#endif
          "NODE_REDIRECT_WARNINGS       write warnings to path instead of\n"
          "                             stderr\n"
          "NODE_REPL_HISTORY            path to the persistent REPL history\n"

diff --git a/test/parallel/test-cli-node-print-help.js b/test/parallel/test-cli-node-print-help.js
@@ -32,9 +32,7 @@ function validateNodePrintHelp() {
     { compileConstant: NODE_FIPS_MODE,
       flags: [ '--enable-fips', '--force-fips' ] },
     { compileConstant: NODE_HAVE_I18N_SUPPORT,
-      flags: [ '--experimental-modules', '--experimental-vm-modules',
-               '--icu-data-dir=dir', '--preserve-symlinks',
-               'NODE_ICU_DATA', 'NODE_PRESERVE_SYMLINKS' ] },
+      flags: [ '--icu-data-dir=dir', 'NODE_ICU_DATA' ] },
     { compileConstant: HAVE_INSPECTOR,
       flags: [ '--inspect-brk[=[host:]port]', '--inspect-port=[host:]port',
                '--inspect[=[host:]port]' ] },