diff options
author | isaacs <i@izs.me> | 2013-02-27 11:24:02 -0800 |
---|---|---|
committer | isaacs <i@izs.me> | 2013-02-27 16:29:36 -0800 |
commit | 875e4a0c59efb0657389a353363fbd2f924cc9cf (patch) | |
tree | 47e5b946af6ae33c97add4201161bf41a7a1329f /test/message | |
parent | 95862b23802175b5d6b509d6a6f83fa5fd53b474 (diff) | |
download | node-new-875e4a0c59efb0657389a353363fbd2f924cc9cf.tar.gz |
core: Remove the nextTick for running the main file
Not necessary, since we can handle the error properly on the first tick
now, even if there are event listeners, etc.
Additionally, this removes the unnecessary "_needTickCallback" from
startup, since Module.loadMain() will kick off a nextTick callback right
after it runs the main module.
Fix #4856
Diffstat (limited to 'test/message')
-rw-r--r-- | test/message/error_exit.out | 6 | ||||
-rw-r--r-- | test/message/max_tick_depth.out | 4 | ||||
-rw-r--r-- | test/message/max_tick_depth_trace.out | 14 | ||||
-rw-r--r-- | test/message/nexttick_throw.out | 7 | ||||
-rw-r--r-- | test/message/undefined_reference_in_new_context.out | 8 |
5 files changed, 22 insertions, 17 deletions
diff --git a/test/message/error_exit.out b/test/message/error_exit.out index acdd424ca9..11ea76fd72 100644 --- a/test/message/error_exit.out +++ b/test/message/error_exit.out @@ -9,6 +9,6 @@ AssertionError: 1 == 2 at Object.Module._extensions..js (module.js:*:*) at Module.load (module.js:*:*) at Function.Module._load (module.js:*:*) - at Module.runMain (module.js:*:*) - at _tickCallback (node.js:*:*) - at process._tickFromSpinner (node.js:*:*) + at Function.Module.runMain (module.js:*:*) + at startup (node.js:*:*) + at node.js:*:* diff --git a/test/message/max_tick_depth.out b/test/message/max_tick_depth.out index aa9876b2be..f285484508 100644 --- a/test/message/max_tick_depth.out +++ b/test/message/max_tick_depth.out @@ -7,8 +7,8 @@ tick 15 tick 14 tick 13 tick 12 -(node) warning: Recursive process.nextTick detected. This will break in the next version of node. Please use setImmediate for recursive deferral. tick 11 +(node) warning: Recursive process.nextTick detected. This will break in the next version of node. Please use setImmediate for recursive deferral. tick 10 tick 9 tick 8 @@ -18,6 +18,6 @@ tick 5 tick 4 tick 3 tick 2 -(node) warning: Recursive process.nextTick detected. This will break in the next version of node. Please use setImmediate for recursive deferral. tick 1 +(node) warning: Recursive process.nextTick detected. This will break in the next version of node. Please use setImmediate for recursive deferral. tick 0 diff --git a/test/message/max_tick_depth_trace.out b/test/message/max_tick_depth_trace.out index 180e5c90f4..8671a8aac3 100644 --- a/test/message/max_tick_depth_trace.out +++ b/test/message/max_tick_depth_trace.out @@ -7,13 +7,15 @@ tick 15 tick 14 tick 13 tick 12 +tick 11 Trace: (node) warning: Recursive process.nextTick detected. This will break in the next version of node. Please use setImmediate for recursive deferral. at maxTickWarn (node.js:*:*) - at process.nextTick (node.js:*:* + at process.nextTick (node.js:*:*) at f (*test*message*max_tick_depth_trace.js:*:*) - at _tickCallback (node.js:*:*) - at process._tickFromSpinner (node.js:*:*) -tick 11 + at process._tickCallback (node.js:*:*) + at Function.Module.runMain (module.js:*:*) + at startup (node.js:*:*) + at node.js:*:* tick 10 tick 9 tick 8 @@ -23,11 +25,11 @@ tick 5 tick 4 tick 3 tick 2 +tick 1 Trace: (node) warning: Recursive process.nextTick detected. This will break in the next version of node. Please use setImmediate for recursive deferral. at maxTickWarn (node.js:*:*) - at process.nextTick (node.js:*:* + at process.nextTick (node.js:*:*) at f (*test*message*max_tick_depth_trace.js:*:*) at _tickCallback (node.js:*:*) at process._tickFromSpinner (node.js:*:*) -tick 1 tick 0 diff --git a/test/message/nexttick_throw.out b/test/message/nexttick_throw.out index 7f9d4e2bab..baced2ce87 100644 --- a/test/message/nexttick_throw.out +++ b/test/message/nexttick_throw.out @@ -1,7 +1,10 @@ + *test*message*nexttick_throw.js:* undefined_reference_error_maker; ^ ReferenceError: undefined_reference_error_maker is not defined at *test*message*nexttick_throw.js:*:* - at _tickCallback (node.js:*:*) - at process._tickFromSpinner (node.js:*:*) + at process._tickCallback (node.js:*:*) + at Function.Module.runMain (module.js:*:*) + at startup (node.js:*:*) + at node.js:*:* diff --git a/test/message/undefined_reference_in_new_context.out b/test/message/undefined_reference_in_new_context.out index 983023b407..f8095ce337 100644 --- a/test/message/undefined_reference_in_new_context.out +++ b/test/message/undefined_reference_in_new_context.out @@ -9,7 +9,7 @@ ReferenceError: foo is not defined at Module._compile (module.js:*) at *..js (module.js:*) at Module.load (module.js:*) - at *._load (module.js:*) - at Module.runMain (module.js:*) - at _tickCallback (node.js:*) - at *._tickFromSpinner (node.js:*) + at Function.Module._load (module.js:*:*) + at Function.Module.runMain (module.js:*:*) + at startup (node.js:*:*) + at node.js:*:* |