summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJohn-David Dalton <john.david.dalton@gmail.com>2018-03-25 11:02:49 -0700
committerJames M Snell <jasnell@gmail.com>2018-04-04 17:31:45 -0700
commit0876a0314d15129e8b29cb6e9753b886086cbfe2 (patch)
tree336f5c9e96c8cb50ee8223eaccc4b99abe8d5b7c /lib
parentae2b5bcb7c17a2d2a488f234c736201eed8200db (diff)
downloadandroid-node-v8-0876a0314d15129e8b29cb6e9753b886086cbfe2.tar.gz
android-node-v8-0876a0314d15129e8b29cb6e9753b886086cbfe2.tar.bz2
android-node-v8-0876a0314d15129e8b29cb6e9753b886086cbfe2.zip
lib: ensure --check flag works with --require
PR-URL: https://github.com/nodejs/node/pull/19600 Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/internal/bootstrap/node.js12
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/internal/bootstrap/node.js b/lib/internal/bootstrap/node.js
index 99bf00a6d6..7762aac846 100644
--- a/lib/internal/bootstrap/node.js
+++ b/lib/internal/bootstrap/node.js
@@ -210,6 +210,12 @@
const CJSModule = NativeModule.require('internal/modules/cjs/loader');
+ perf.markMilestone(NODE_PERFORMANCE_MILESTONE_MODULE_LOAD_END);
+ perf.markMilestone(
+ NODE_PERFORMANCE_MILESTONE_PRELOAD_MODULE_LOAD_START);
+ preloadModules();
+ perf.markMilestone(
+ NODE_PERFORMANCE_MILESTONE_PRELOAD_MODULE_LOAD_END);
// check if user passed `-c` or `--check` arguments to Node.
if (process._syntax_check_only != null) {
const fs = NativeModule.require('fs');
@@ -219,12 +225,6 @@
checkScriptSyntax(source, filename);
process.exit(0);
}
- perf.markMilestone(NODE_PERFORMANCE_MILESTONE_MODULE_LOAD_END);
- perf.markMilestone(
- NODE_PERFORMANCE_MILESTONE_PRELOAD_MODULE_LOAD_START);
- preloadModules();
- perf.markMilestone(
- NODE_PERFORMANCE_MILESTONE_PRELOAD_MODULE_LOAD_END);
CJSModule.runMain();
} else {
perf.markMilestone(NODE_PERFORMANCE_MILESTONE_MODULE_LOAD_START);