diff options
| author | isaacs <i@izs.me> | 2012-05-09 15:12:13 -0700 |
|---|---|---|
| committer | isaacs <i@izs.me> | 2012-05-09 15:12:13 -0700 |
| commit | 07be9fc3a674d8a2e148041f3674c1abaee0907f (patch) | |
| tree | b4075cce21b1a5697420a45388bb884bc71418d9 /test/message | |
| parent | 5979f096d1b702ca2ba95664a0bbc8210109775b (diff) | |
| parent | bf9d8e9214e2098bacf18416564dc3a91bcdf5d6 (diff) | |
| download | node-new-07be9fc3a674d8a2e148041f3674c1abaee0907f.tar.gz | |
Merge remote-tracking branch 'ry/v0.6' into v0.6-merge
Conflicts:
Makefile
lib/zlib.js
src/node.cc
src/node.js
Diffstat (limited to 'test/message')
| -rw-r--r-- | test/message/stack_overflow.out | 6 | ||||
| -rw-r--r-- | test/message/throw_custom_error.out | 6 | ||||
| -rw-r--r-- | test/message/throw_non_error.out | 6 | ||||
| -rw-r--r-- | test/message/undefined_reference_in_new_context.out | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/test/message/stack_overflow.out b/test/message/stack_overflow.out index f09f10bb5a..72dc019ff1 100644 --- a/test/message/stack_overflow.out +++ b/test/message/stack_overflow.out @@ -1,6 +1,6 @@ before -node.js:* - throw e; // process.nextTick error, or 'error' event on first tick - ^ +*test*message*stack_overflow.js:31 +function stackOverflow() { + ^ RangeError: Maximum call stack size exceeded diff --git a/test/message/throw_custom_error.out b/test/message/throw_custom_error.out index 357afdb76b..e8c9903a3a 100644 --- a/test/message/throw_custom_error.out +++ b/test/message/throw_custom_error.out @@ -1,6 +1,6 @@ before -node.js:* - throw e; // process.nextTick error, or 'error' event on first tick - ^ +*test*message*throw_custom_error.js:31 +throw ({ name: 'MyCustomError', message: 'This is a custom message' }); +^ MyCustomError: This is a custom message diff --git a/test/message/throw_non_error.out b/test/message/throw_non_error.out index 477b13cd8a..23e3d928e8 100644 --- a/test/message/throw_non_error.out +++ b/test/message/throw_non_error.out @@ -1,6 +1,6 @@ before -node.js:* - throw e; // process.nextTick error, or 'error' event on first tick - ^ +*/test/message/throw_non_error.js:31 +throw ({ foo: 'bar' }); +^ [object Object] diff --git a/test/message/undefined_reference_in_new_context.out b/test/message/undefined_reference_in_new_context.out index a32a4d3a2b..fc8c13eb59 100644 --- a/test/message/undefined_reference_in_new_context.out +++ b/test/message/undefined_reference_in_new_context.out @@ -1,8 +1,8 @@ before -node.js:* - throw e; // process.nextTick error, or 'error' event on first tick - ^ +*test*message*undefined_reference_in_new_context.js:34 +script.runInNewContext(); + ^ ReferenceError: foo is not defined at evalmachine.<anonymous>:* at Object.<anonymous> (*test*message*undefined_reference_in_new_context.js:*) |