test: remove cjs loader from stack traces

PR-URL: https://github.com/nodejs/node/pull/44197
Backport-PR-URL: https://github.com/nodejs/node/pull/46535
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
Reviewed-By: Michaël Zasso <targos@protonmail.com>

47 files changed, 50 insertions, 216 deletions

diff --git a/test/message/core_line_numbers.js b/test/message/core_line_numbers.js
index 221001ed89..585a604265 100644
--- a/test/message/core_line_numbers.js
+++ b/test/message/core_line_numbers.js
@@ -1,5 +1,7 @@
 'use strict';
 require('../common');
+Error.stackTraceLimit = 3;
+
 const punycode = require('punycode');
 
 // This test verifies that line numbers in core modules are reported correctly.
diff --git a/test/message/core_line_numbers.out b/test/message/core_line_numbers.out
index 97b017f66e..e1f36f1c9c 100644
--- a/test/message/core_line_numbers.out
+++ b/test/message/core_line_numbers.out
@@ -6,9 +6,3 @@ RangeError: Invalid input
     at error (node:punycode:52:8)
     at Object.decode (node:punycode:*:*)
     at Object.<anonymous> (*test*message*core_line_numbers.js:*:*)
-    at Module._compile (node:internal/modules/cjs/loader:*:*)
-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*:*)
-    at Module.load (node:internal/modules/cjs/loader:*:*)
-    at Function.Module._load (node:internal/modules/cjs/loader:*:*)
-    at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:*:*)
-    at node:internal/main/run_main_module:*:*
diff --git a/test/message/error_aggregateTwoErrors.js b/test/message/error_aggregateTwoErrors.js
index a59a6b5788..6cb6cce095 100644
--- a/test/message/error_aggregateTwoErrors.js
+++ b/test/message/error_aggregateTwoErrors.js
@@ -2,6 +2,8 @@
 'use strict';
 
 require('../common');
+Error.stackTraceLimit = 1;
+
 const { aggregateTwoErrors } = require('internal/errors');
 
 const originalError = new Error('original');
diff --git a/test/message/error_aggregateTwoErrors.out b/test/message/error_aggregateTwoErrors.out
index 02e8738d47..2dac257d48 100644
--- a/test/message/error_aggregateTwoErrors.out
+++ b/test/message/error_aggregateTwoErrors.out
@@ -1,34 +1,15 @@
 *error_aggregateTwoErrors.js:*
 throw aggregateTwoErrors(err, originalError);
 ^
-AggregateError: original
-    at Object.<anonymous> (*test*message*error_aggregateTwoErrors.js:*:*)
-    at Module._compile (node:internal/modules/cjs/loader:*:*)
-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*:*)
-    at Module.load (node:internal/modules/cjs/loader:*:*)
-    at Function.Module._load (node:internal/modules/cjs/loader:*:*)
-    at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:*:*)
-    at node:internal/main/run_main_module:*:* {
+[AggregateError: original] {
   code: 'ERR0',
   [errors]: [
     Error: original
-        at Object.<anonymous> (*test*message*error_aggregateTwoErrors.js:*:*)
-        at Module._compile (node:internal/modules/cjs/loader:*:*)
-        at Object.Module._extensions..js (node:internal/modules/cjs/loader:*:*)
-        at Module.load (node:internal/modules/cjs/loader:*:*)
-        at Function.Module._load (node:internal/modules/cjs/loader:*:*)
-        at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:*:*)
-        at node:internal/main/run_main_module:*:* {
+        at Object.<anonymous> (*test*message*error_aggregateTwoErrors.js:*:*) {
       code: 'ERR0'
     },
     Error: second error
-        at Object.<anonymous> (*test*message*error_aggregateTwoErrors.js:*:*)
-        at Module._compile (node:internal/modules/cjs/loader:*:*)
-        at Object.Module._extensions..js (node:internal/modules/cjs/loader:*:*)
-        at Module.load (node:internal/modules/cjs/loader:*:*)
-        at Function.Module._load (node:internal/modules/cjs/loader:*:*)
-        at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:*:*)
-        at node:internal/main/run_main_module:*:* {
+        at Object.<anonymous> (*test*message*error_aggregateTwoErrors.js:*:*) {
       code: 'ERR1'
     }
   ]
diff --git a/test/message/error_exit.js b/test/message/error_exit.js
index 057a371df2..51d303015f 100644
--- a/test/message/error_exit.js
+++ b/test/message/error_exit.js
@@ -21,6 +21,8 @@
 
 'use strict';
 require('../common');
+Error.stackTraceLimit = 1;
+
 const assert = require('assert');
 
 process.on('exit', function(code) {
diff --git a/test/message/error_exit.out b/test/message/error_exit.out
index 2ef95b535d..e0ecbfda64 100644
--- a/test/message/error_exit.out
+++ b/test/message/error_exit.out
@@ -7,13 +7,7 @@ AssertionError [ERR_ASSERTION]: Expected values to be strictly equal:
 
 1 !== 2
 
-    at Object.<anonymous> (*test*message*error_exit.js:*:*)
-    at Module._compile (node:internal/modules/cjs/loader:*:*)
-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*:*)
-    at Module.load (node:internal/modules/cjs/loader:*:*)
-    at Function.Module._load (node:internal/modules/cjs/loader:*:*)
-    at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:*:*)
-    at node:internal/main/run_main_module:*:* {
+    at Object.<anonymous> (*test*message*error_exit.js:*:*) {
   generatedMessage: true,
   code: 'ERR_ASSERTION',
   actual: 1,
diff --git a/test/message/error_with_nul.js b/test/message/error_with_nul.js
index 2849e9d21c..de49c383fd 100644
--- a/test/message/error_with_nul.js
+++ b/test/message/error_with_nul.js
@@ -1,5 +1,6 @@
 'use strict';
 require('../common');
+Error.stackTraceLimit = 2;
 
 function test() {
   const a = 'abc\0def';
diff --git a/test/message/error_with_nul.out b/test/message/error_with_nul.out
index 7fbb33f08e..e5f6bdb92b 100644
--- a/test/message/error_with_nul.out
+++ b/test/message/error_with_nul.out
diff --git a/test/message/events_unhandled_error_common_trace.js b/test/message/events_unhandled_error_common_trace.js
index e6c168fc06..6ec4bed948 100644
--- a/test/message/events_unhandled_error_common_trace.js
+++ b/test/message/events_unhandled_error_common_trace.js
@@ -1,5 +1,7 @@
 'use strict';
 require('../common');
+Error.stackTraceLimit = 2;
+
 const EventEmitter = require('events');
 
 function foo() {
diff --git a/test/message/events_unhandled_error_common_trace.out b/test/message/events_unhandled_error_common_trace.out
index 19e89869ba..4c2b8e0c97 100644
--- a/test/message/events_unhandled_error_common_trace.out
+++ b/test/message/events_unhandled_error_common_trace.out
@@ -5,16 +5,6 @@ node:events:*
 Error: foo:bar
     at bar (*events_unhandled_error_common_trace.js:*:*)
     at foo (*events_unhandled_error_common_trace.js:*:*)
-    at Object.<anonymous> (*events_unhandled_error_common_trace.js:*:*)
-    at Module._compile (node:internal/modules/cjs/loader:*:*)
-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*:*)
-    at Module.load (node:internal/modules/cjs/loader:*:*)
-    at Function.Module._load (node:internal/modules/cjs/loader:*:*)
-    at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:*:*)
-    at node:internal/main/run_main_module:*:*
 Emitted 'error' event at:
     at quux (*events_unhandled_error_common_trace.js:*:*)
     at Object.<anonymous> (*events_unhandled_error_common_trace.js:*:*)
-    at Module._compile (node:internal/modules/cjs/loader:*:*)
-    [... lines matching original stack trace ...]
-    at node:internal/main/run_main_module:*:*
diff --git a/test/message/events_unhandled_error_nexttick.js b/test/message/events_unhandled_error_nexttick.js
index 713031eeef..bf508c9788 100644
--- a/test/message/events_unhandled_error_nexttick.js
+++ b/test/message/events_unhandled_error_nexttick.js
@@ -1,5 +1,7 @@
 'use strict';
 require('../common');
+Error.stackTraceLimit = 1;
+
 const EventEmitter = require('events');
 const er = new Error();
 process.nextTick(() => {
diff --git a/test/message/events_unhandled_error_nexttick.out b/test/message/events_unhandled_error_nexttick.out
index 3e0d469750..7e3ee8a104 100644
--- a/test/message/events_unhandled_error_nexttick.out
+++ b/test/message/events_unhandled_error_nexttick.out
@@ -4,12 +4,5 @@ node:events:*
 
 Error
     at Object.<anonymous> (*events_unhandled_error_nexttick.js:*:*)
-    at Module._compile (node:internal/modules/cjs/loader:*:*)
-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*:*)
-    at Module.load (node:internal/modules/cjs/loader:*:*)
-    at Function.Module._load (node:internal/modules/cjs/loader:*:*)
-    at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:*:*)
-    at node:internal/main/run_main_module:*:*
 Emitted 'error' event at:
     at *events_unhandled_error_nexttick.js:*:*
-    at processTicksAndRejections (node:internal/process/task_queues:*:*)
diff --git a/test/message/events_unhandled_error_sameline.js b/test/message/events_unhandled_error_sameline.js
index 1e5e77d08c..6dad22dd58 100644
--- a/test/message/events_unhandled_error_sameline.js
+++ b/test/message/events_unhandled_error_sameline.js
@@ -1,4 +1,6 @@
 'use strict';
 require('../common');
+Error.stackTraceLimit = 1;
+
 const EventEmitter = require('events');
 new EventEmitter().emit('error', new Error());
diff --git a/test/message/events_unhandled_error_sameline.out b/test/message/events_unhandled_error_sameline.out
index c027275033..4b70d091f6 100644
--- a/test/message/events_unhandled_error_sameline.out
+++ b/test/message/events_unhandled_error_sameline.out
@@ -4,14 +4,5 @@ node:events:*
 
 Error
     at Object.<anonymous> (*events_unhandled_error_sameline.js:*:*)
-    at Module._compile (node:internal/modules/cjs/loader:*:*)
-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*:*)
-    at Module.load (node:internal/modules/cjs/loader:*:*)
-    at Function.Module._load (node:internal/modules/cjs/loader:*:*)
-    at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:*:*)
-    at node:internal/main/run_main_module:*:*
 Emitted 'error' event at:
     at Object.<anonymous> (*events_unhandled_error_sameline.js:*:*)
-    at Module._compile (node:internal/modules/cjs/loader:*:*)
-    [... lines matching original stack trace ...]
-    at node:internal/main/run_main_module:*:*
diff --git a/test/message/events_unhandled_error_subclass.js b/test/message/events_unhandled_error_subclass.js
index 8303cb2237..5fc3bc26fb 100644
--- a/test/message/events_unhandled_error_subclass.js
+++ b/test/message/events_unhandled_error_subclass.js
@@ -1,5 +1,7 @@
 'use strict';
 require('../common');
+Error.stackTraceLimit = 1;
+
 const EventEmitter = require('events');
 class Foo extends EventEmitter {}
 new Foo().emit('error', new Error());
diff --git a/test/message/events_unhandled_error_subclass.out b/test/message/events_unhandled_error_subclass.out
index 5b8131970d..3b8371636a 100644
--- a/test/message/events_unhandled_error_subclass.out
+++ b/test/message/events_unhandled_error_subclass.out
@@ -4,14 +4,5 @@ node:events:*
 
 Error
     at Object.<anonymous> (*events_unhandled_error_subclass.js:*:*)
-    at Module._compile (node:internal/modules/cjs/loader:*:*)
-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*:*)
-    at Module.load (node:internal/modules/cjs/loader:*:*)
-    at Function.Module._load (node:internal/modules/cjs/loader:*:*)
-    at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:*:*)
-    at node:internal/main/run_main_module:*:*
 Emitted 'error' event on Foo instance at:
     at Object.<anonymous> (*events_unhandled_error_subclass.js:*:*)
-    at Module._compile (node:internal/modules/cjs/loader:*:*)
-    [... lines matching original stack trace ...]
-    at node:internal/main/run_main_module:*:*
diff --git a/test/message/if-error-has-good-stack.js b/test/message/if-error-has-good-stack.js
index 1db25d2fa5..4f529d3e5d 100644
--- a/test/message/if-error-has-good-stack.js
+++ b/test/message/if-error-has-good-stack.js
@@ -1,6 +1,8 @@
 'use strict';
 
 require('../common');
+Error.stackTraceLimit = 4;
+
 const assert = require('assert');
 
 let err;
diff --git a/test/message/if-error-has-good-stack.out b/test/message/if-error-has-good-stack.out
index d87581cd76..a0fcc65d90 100644
--- a/test/message/if-error-has-good-stack.out
+++ b/test/message/if-error-has-good-stack.out
@@ -10,26 +10,14 @@ AssertionError [ERR_ASSERTION]: ifError got unwanted exception: test error
     at c (*if-error-has-good-stack.js:*:*)
     at b (*if-error-has-good-stack.js:*:*)
     at a (*if-error-has-good-stack.js:*:*)
-    at Object.<anonymous> (*if-error-has-good-stack.js:*:*)
-    at Module._compile (node:internal/modules/cjs/loader:*:*)
-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*:*)
-    at Module.load (node:internal/modules/cjs/loader:*:*)
-    at Function.Module._load (node:internal/modules/cjs/loader:*:*)
-    at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:*:*)
-    at node:internal/main/run_main_module:*:* {
+    at Object.<anonymous> (*if-error-has-good-stack.js:*:*) {
   generatedMessage: false,
   code: 'ERR_ASSERTION',
   actual: Error: test error
       at c (*if-error-has-good-stack.js:*:*)
       at b (*if-error-has-good-stack.js:*:*)
       at a (*if-error-has-good-stack.js:*:*)
-      at Object.<anonymous> (*if-error-has-good-stack.js:*:*)
-      at Module._compile (node:internal/modules/cjs/loader:*:*)
-      at Object.Module._extensions..js (node:internal/modules/cjs/loader:*:*)
-      at Module.load (node:internal/modules/cjs/loader:*:*)
-      at Function.Module._load (node:internal/modules/cjs/loader:*:*)
-      at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:*:*)
-      at node:internal/main/run_main_module:*:*
+      at Object.<anonymous> (*if-error-has-good-stack.js:*:*),
   expected: null,
   operator: 'ifError'
 }
diff --git a/test/message/source_map_disabled_by_api.js b/test/message/source_map_disabled_by_api.js
index 8405e4f366..a1632565e3 100644
--- a/test/message/source_map_disabled_by_api.js
+++ b/test/message/source_map_disabled_by_api.js
@@ -2,6 +2,7 @@
 
 'use strict';
 require('../common');
+Error.stackTraceLimit = 5;
 
 process.setSourceMapsEnabled(false);
 
diff --git a/test/message/source_map_disabled_by_api.out b/test/message/source_map_disabled_by_api.out
index d2cca7da52..23db9db864 100644
--- a/test/message/source_map_disabled_by_api.out
+++ b/test/message/source_map_disabled_by_api.out
@@ -4,11 +4,6 @@ Error: an error!
     at functionB (*enclosing-call-site-min.js:1:60)
     at functionA (*enclosing-call-site-min.js:1:26)
     at Object.<anonymous> (*enclosing-call-site-min.js:1:199)
-    at Module._compile (node:internal/modules/cjs/loader:*)
-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*)
-    at Module.load (node:internal/modules/cjs/loader:*)
-    at Function.Module._load (node:internal/modules/cjs/loader:*)
-    at Module.require (node:internal/modules/cjs/loader:*)
 *enclosing-call-site.js:16
       throw new Error('an error!')
                 ^
@@ -19,8 +14,3 @@ Error: an error!
     at functionB (*enclosing-call-site.js:6:3)
     at functionA (*enclosing-call-site.js:2:3)
     at Object.<anonymous> (*enclosing-call-site.js:24:3)
-    at Module._compile (node:internal/modules/cjs/loader:*)
-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*)
-    at Module.load (node:internal/modules/cjs/loader:*)
-    at Function.Module._load (node:internal/modules/cjs/loader:*)
-    at Module.require (node:internal/modules/cjs/loader:*)
diff --git a/test/message/source_map_enabled_by_api.js b/test/message/source_map_enabled_by_api.js
index 3133bd2639..dd995be877 100644
--- a/test/message/source_map_enabled_by_api.js
+++ b/test/message/source_map_enabled_by_api.js
@@ -1,5 +1,6 @@
 'use strict';
 require('../common');
+Error.stackTraceLimit = 5;
 
 process.setSourceMapsEnabled(true);
 
diff --git a/test/message/source_map_enabled_by_api.out b/test/message/source_map_enabled_by_api.out
index 525ceccec1..069b35a1a2 100644
--- a/test/message/source_map_enabled_by_api.out
+++ b/test/message/source_map_enabled_by_api.out
@@ -8,11 +8,6 @@ Error: an error!
     at functionB (*enclosing-call-site.js:6:3)
     at functionA (*enclosing-call-site.js:2:3)
     at Object.<anonymous> (*enclosing-call-site.js:24:3)
-    at Module._compile (node:internal/modules/cjs/loader:*)
-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*)
-    at Module.load (node:internal/modules/cjs/loader:*)
-    at Function.Module._load (node:internal/modules/cjs/loader:*)
-    at Module.require (node:internal/modules/cjs/loader:*)
 *enclosing-call-site-min.js:1
 var functionA=function(){functionB()};function functionB(){functionC()}var functionC=function(){functionD()},functionD=function(){if(0<Math.random())throw Error("an error!");},thrower=functionA;try{functionA()}catch(a){throw a;};
                                                                                                                                                                                                                            ^
@@ -23,8 +18,3 @@ Error: an error!
     at functionB (*enclosing-call-site-min.js:1:60)
     at functionA (*enclosing-call-site-min.js:1:26)
     at Object.<anonymous> (*enclosing-call-site-min.js:1:199)
-    at Module._compile (node:internal/modules/cjs/loader:*)
-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*)
-    at Module.load (node:internal/modules/cjs/loader:*)
-    at Function.Module._load (node:internal/modules/cjs/loader:*)
-    at Module.require (node:internal/modules/cjs/loader:*)
diff --git a/test/message/source_map_enclosing_function.js b/test/message/source_map_enclosing_function.js
index 43b6931bf1..f77bd818f0 100644
--- a/test/message/source_map_enclosing_function.js
+++ b/test/message/source_map_enclosing_function.js
@@ -2,4 +2,6 @@
 
 'use strict';
 require('../common');
+Error.stackTraceLimit = 5;
+
 require('../fixtures/source-map/enclosing-call-site-min.js');
diff --git a/test/message/source_map_enclosing_function.out b/test/message/source_map_enclosing_function.out
index 3eb76ecbbe..153666a022 100644
--- a/test/message/source_map_enclosing_function.out
+++ b/test/message/source_map_enclosing_function.out
@@ -8,8 +8,3 @@ Error: an error!
     at functionB (*enclosing-call-site.js:6:3)
     at functionA (*enclosing-call-site.js:2:3)
     at Object.<anonymous> (*enclosing-call-site.js:24:3)
-    at Module._compile (node:internal/modules/cjs/loader:*)
-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*)
-    at Module.load (node:internal/modules/cjs/loader:*)
-    at Function.Module._load (node:internal/modules/cjs/loader:*)
-    at Module.require (node:internal/modules/cjs/loader:*)
diff --git a/test/message/source_map_eval.js b/test/message/source_map_eval.js
index 534d16bd34..404793f054 100644
--- a/test/message/source_map_eval.js
+++ b/test/message/source_map_eval.js
@@ -2,6 +2,8 @@
 
 'use strict';
 require('../common');
+Error.stackTraceLimit = 3;
+
 const fs = require('fs');
 
 const content = fs.readFileSync(require.resolve('../fixtures/source-map/tabs.js'), 'utf8');
diff --git a/test/message/source_map_eval.out b/test/message/source_map_eval.out
index 7cfd7c84fe..b93eaaf1b0 100644
--- a/test/message/source_map_eval.out
+++ b/test/message/source_map_eval.out
@@ -1,10 +1,4 @@
 ReferenceError: alert is not defined
     at Object.eval (*tabs.coffee:26:2)
     at eval (*tabs.coffee:1:14)
-    at Object.<anonymous> (*source_map_eval.js:8:1)
-    at Module._compile (node:internal/modules/cjs/loader:*)
-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*)
-    at Module.load (node:internal/modules/cjs/loader:*)
-    at Function.Module._load (node:internal/modules/cjs/loader:*)
-    at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:*)
-    at node:internal/main/run_main_module:*
+    at Object.<anonymous> (*source_map_eval.js:*:*)
diff --git a/test/message/source_map_reference_error_tabs.js b/test/message/source_map_reference_error_tabs.js
index f6a39d9d49..fbe058a5f5 100644
--- a/test/message/source_map_reference_error_tabs.js
+++ b/test/message/source_map_reference_error_tabs.js
@@ -2,4 +2,6 @@
 
 'use strict';
 require('../common');
+Error.stackTraceLimit = 2;
+
 require('../fixtures/source-map/tabs.js');
diff --git a/test/message/source_map_reference_error_tabs.out b/test/message/source_map_reference_error_tabs.out
index bce1b5f891..2a98f50425 100644
--- a/test/message/source_map_reference_error_tabs.out
+++ b/test/message/source_map_reference_error_tabs.out
@@ -5,11 +5,3 @@
 ReferenceError: alert is not defined
     at *tabs.coffee:26:2*
     at *tabs.coffee:1:14*
-    at Module._compile (node:internal/modules/cjs/loader:*
-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*
-    at Module.load (node:internal/modules/cjs/loader:*
-    at Function.Module._load (node:internal/modules/cjs/loader:*
-    at Module.require (node:internal/modules/cjs/loader:*
-    at require (node:internal/modules/cjs/helpers:*
-    at Object.<anonymous> (*source_map_reference_error_tabs.js:*
-    at Module._compile (node:internal/modules/cjs/loader:*
diff --git a/test/message/source_map_throw_catch.js b/test/message/source_map_throw_catch.js
index f3a887474b..603fa81867 100644
--- a/test/message/source_map_throw_catch.js
+++ b/test/message/source_map_throw_catch.js
@@ -2,6 +2,8 @@
 
 'use strict';
 require('../common');
+Error.stackTraceLimit = 2;
+
 try {
   require('../fixtures/source-map/typescript-throw');
 } catch (err) {
diff --git a/test/message/source_map_throw_catch.out b/test/message/source_map_throw_catch.out
index 95bba5eee3..9cf964e551 100644
--- a/test/message/source_map_throw_catch.out
+++ b/test/message/source_map_throw_catch.out
@@ -5,11 +5,3 @@ reachable
 Error: an exception
     at *typescript-throw.ts:18:11*
     at *typescript-throw.ts:24:1*
-    at Module._compile (node:internal/modules/cjs/loader:*)
-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*)
-    at Module.load (node:internal/modules/cjs/loader:*)
-    at Function.Module._load (node:internal/modules/cjs/loader:*)
-    at Module.require (node:internal/modules/cjs/loader:*)
-    at require (node:internal/modules/cjs/helpers:*)
-    at Object.<anonymous> (*source_map_throw_catch.js:6:3)
-    at Module._compile (node:internal/modules/cjs/loader:*)
diff --git a/test/message/source_map_throw_first_tick.js b/test/message/source_map_throw_first_tick.js
index b691b51f35..9bf1a353cf 100644
--- a/test/message/source_map_throw_first_tick.js
+++ b/test/message/source_map_throw_first_tick.js
@@ -2,4 +2,6 @@
 
 'use strict';
 require('../common');
+Error.stackTraceLimit = 2;
+
 require('../fixtures/source-map/typescript-throw');
diff --git a/test/message/source_map_throw_first_tick.out b/test/message/source_map_throw_first_tick.out
index efa97a1d9f..9cf964e551 100644
--- a/test/message/source_map_throw_first_tick.out
+++ b/test/message/source_map_throw_first_tick.out
@@ -5,11 +5,3 @@ reachable
 Error: an exception
     at *typescript-throw.ts:18:11*
     at *typescript-throw.ts:24:1*
-    at Module._compile (node:internal/modules/cjs/loader:*)
-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*)
-    at Module.load (node:internal/modules/cjs/loader:*)
-    at Function.Module._load (node:internal/modules/cjs/loader:*)
-    at Module.require (node:internal/modules/cjs/loader:*)
-    at require (node:internal/modules/cjs/helpers:*)
-    at Object.<anonymous> (*source_map_throw_first_tick.js:5:1)
-    at Module._compile (node:internal/modules/cjs/loader:*)
diff --git a/test/message/source_map_throw_icu.js b/test/message/source_map_throw_icu.js
index 00298edc5e..672c1575c6 100644
--- a/test/message/source_map_throw_icu.js
+++ b/test/message/source_map_throw_icu.js
@@ -2,4 +2,6 @@
 
 'use strict';
 require('../common');
+Error.stackTraceLimit = 2;
+
 require('../fixtures/source-map/icu');
diff --git a/test/message/source_map_throw_icu.out b/test/message/source_map_throw_icu.out
index 78482d73dd..9c01f25c78 100644
--- a/test/message/source_map_throw_icu.out
+++ b/test/message/source_map_throw_icu.out
@@ -5,11 +5,3 @@
 Error: an error
     at *icu.jsx:3:23*
     at *icu.jsx:9:5*
-    at Module._compile (node:internal/modules/cjs/loader:*
-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*
-    at Module.load (node:internal/modules/cjs/loader:*
-    at Function.Module._load (node:internal/modules/cjs/loader:*
-    at Module.require (node:internal/modules/cjs/loader:*
-    at require (node:internal/modules/cjs/helpers:*
-    at Object.<anonymous> (*source_map_throw_icu.js:*
-    at Module._compile (node:internal/modules/cjs/loader:*
diff --git a/test/message/throw_error_with_getter_throw_traced.js b/test/message/throw_error_with_getter_throw_traced.js
deleted file mode 100644
index 609bd9caf8..0000000000
--- a/test/message/throw_error_with_getter_throw_traced.js
+++ /dev/null
@@ -1,11 +0,0 @@
-// Flags: --trace-uncaught
-'use strict';
-require('../common');
-throw {  // eslint-disable-line no-throw-literal
-  get stack() {
-    throw new Error('weird throw but ok');
-  },
-  get name() {
-    throw new Error('weird throw but ok');
-  },
-};
diff --git a/test/message/throw_null_traced.js b/test/message/throw_null_traced.js
deleted file mode 100644
index fee8928f88..0000000000
--- a/test/message/throw_null_traced.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// Flags: --trace-uncaught
-'use strict';
-require('../common');
-
-// eslint-disable-next-line no-throw-literal
-throw null;
diff --git a/test/message/throw_undefined_traced.js b/test/message/throw_undefined_traced.js
deleted file mode 100644
index f6ded43378..0000000000
--- a/test/message/throw_undefined_traced.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// Flags: --trace-uncaught
-'use strict';
-require('../common');
-
-// eslint-disable-next-line no-throw-literal
-throw undefined;
diff --git a/test/message/undefined_reference_in_new_context.js b/test/message/undefined_reference_in_new_context.js
index 7cb68ec5b3..29a67632f8 100644
--- a/test/message/undefined_reference_in_new_context.js
+++ b/test/message/undefined_reference_in_new_context.js
@@ -26,6 +26,6 @@ const vm = require('vm');
 console.error('before');
 
 // undefined reference
-vm.runInNewContext('foo.bar = 5;');
+vm.runInNewContext('Error.stackTraceLimit = 5; foo.bar = 5;');
 
 console.error('after');
diff --git a/test/message/undefined_reference_in_new_context.out b/test/message/undefined_reference_in_new_context.out
index 61dee9f6d4..b393d7f6b2 100644
--- a/test/message/undefined_reference_in_new_context.out
+++ b/test/message/undefined_reference_in_new_context.out
@@ -1,16 +1,11 @@
 before
 evalmachine.<anonymous>:1
-foo.bar = 5;
-^
+Error.stackTraceLimit = 5; foo.bar = 5;
+                           ^
 
 ReferenceError: foo is not defined
-    at evalmachine.<anonymous>:1:1
+    at evalmachine.<anonymous>:*:*
     at Script.runInContext (node:vm:*)
     at Script.runInNewContext (node:vm:*)
     at Object.runInNewContext (node:vm:*)
     at Object.<anonymous> (*test*message*undefined_reference_in_new_context.js:*)
-    at Module._compile (node:internal/modules/cjs/loader:*)
-    at *..js (node:internal/modules/cjs/loader:*)
-    at Module.load (node:internal/modules/cjs/loader:*)
-    at Function.Module._load (node:internal/modules/cjs/loader:*:*)
-    at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:*:*)
diff --git a/test/message/vm_display_runtime_error.js b/test/message/vm_display_runtime_error.js
index 3ebbb1464d..80505cb02f 100644
--- a/test/message/vm_display_runtime_error.js
+++ b/test/message/vm_display_runtime_error.js
@@ -21,6 +21,8 @@
 
 'use strict';
 require('../common');
+Error.stackTraceLimit = 4;
+
 const vm = require('vm');
 
 console.error('beginning');
diff --git a/test/message/vm_display_runtime_error.out b/test/message/vm_display_runtime_error.out
index 8f1e9c3796..bb54dfbbef 100644
--- a/test/message/vm_display_runtime_error.out
+++ b/test/message/vm_display_runtime_error.out
@@ -8,12 +8,6 @@ Error: boo!
     at Script.runInThisContext (node:vm:*)
     at Object.runInThisContext (node:vm:*)
     at Object.<anonymous> (*test*message*vm_display_runtime_error.js:*)
-    at Module._compile (node:internal/modules/cjs/loader:*)
-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*)
-    at Module.load (node:internal/modules/cjs/loader:*)
-    at Function.Module._load (node:internal/modules/cjs/loader:*)
-    at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:*)
-    at node:internal/main/run_main_module:*:*
 test.vm:1
 throw new Error("spooky!")
 ^
@@ -23,9 +17,3 @@ Error: spooky!
     at Script.runInThisContext (node:vm:*)
     at Object.runInThisContext (node:vm:*)
     at Object.<anonymous> (*test*message*vm_display_runtime_error.js:*)
-    at Module._compile (node:internal/modules/cjs/loader:*)
-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*)
-    at Module.load (node:internal/modules/cjs/loader:*)
-    at Function.Module._load (node:internal/modules/cjs/loader:*)
-    at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:*)
-    at node:internal/main/run_main_module:*:*
diff --git a/test/message/vm_display_syntax_error.js b/test/message/vm_display_syntax_error.js
index ac9b4d17bd..f47d8d477e 100644
--- a/test/message/vm_display_syntax_error.js
+++ b/test/message/vm_display_syntax_error.js
@@ -21,6 +21,8 @@
 
 'use strict';
 require('../common');
+Error.stackTraceLimit = 4;
+
 const vm = require('vm');
 
 console.error('beginning');
diff --git a/test/message/vm_display_syntax_error.out b/test/message/vm_display_syntax_error.out
index b0b70fcd75..b0a5b82aca 100644
--- a/test/message/vm_display_syntax_error.out
+++ b/test/message/vm_display_syntax_error.out
@@ -7,12 +7,6 @@ SyntaxError: Unexpected number
     at createScript (node:vm:*)
     at Object.runInThisContext (node:vm:*)
     at Object.<anonymous> (*test*message*vm_display_syntax_error.js:*)
-    at Module._compile (node:internal/modules/cjs/loader:*)
-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*)
-    at Module.load (node:internal/modules/cjs/loader:*)
-    at Function.Module._load (node:internal/modules/cjs/loader:*)
-    at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:*)
-    at node:internal/main/run_main_module:*:*
 test.vm:1
 var 5;
     ^
@@ -21,9 +15,3 @@ SyntaxError: Unexpected number
     at createScript (node:vm:*)
     at Object.runInThisContext (node:vm:*)
     at Object.<anonymous> (*test*message*vm_display_syntax_error.js:*)
-    at Module._compile (node:internal/modules/cjs/loader:*)
-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*)
-    at Module.load (node:internal/modules/cjs/loader:*)
-    at Function.Module._load (node:internal/modules/cjs/loader:*)
-    at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:*)
-    at node:internal/main/run_main_module:*:*
diff --git a/test/message/vm_dont_display_runtime_error.js b/test/message/vm_dont_display_runtime_error.js
index 49203684ed..44bdaf42d9 100644
--- a/test/message/vm_dont_display_runtime_error.js
+++ b/test/message/vm_dont_display_runtime_error.js
@@ -21,6 +21,8 @@
 
 'use strict';
 require('../common');
+Error.stackTraceLimit = 4;
+
 const vm = require('vm');
 
 console.error('beginning');
diff --git a/test/message/vm_dont_display_runtime_error.out b/test/message/vm_dont_display_runtime_error.out
index 2ff2e8355a..1e0fd6b55d 100644
--- a/test/message/vm_dont_display_runtime_error.out
+++ b/test/message/vm_dont_display_runtime_error.out
@@ -9,9 +9,3 @@ Error: boo!
     at Script.runInThisContext (node:vm:*)
     at Object.runInThisContext (node:vm:*)
     at Object.<anonymous> (*test*message*vm_dont_display_runtime_error.js:*)
-    at Module._compile (node:internal/modules/cjs/loader:*)
-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*)
-    at Module.load (node:internal/modules/cjs/loader:*)
-    at Function.Module._load (node:internal/modules/cjs/loader:*)
-    at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:*)
-    at node:internal/main/run_main_module:*:*
diff --git a/test/message/vm_dont_display_syntax_error.js b/test/message/vm_dont_display_syntax_error.js
index 38c49ad1a6..01ab0b6395 100644
--- a/test/message/vm_dont_display_syntax_error.js
+++ b/test/message/vm_dont_display_syntax_error.js
@@ -21,6 +21,8 @@
 
 'use strict';
 require('../common');
+Error.stackTraceLimit = 4;
+
 const vm = require('vm');
 
 console.error('beginning');
diff --git a/test/message/vm_dont_display_syntax_error.out b/test/message/vm_dont_display_syntax_error.out
index d46dce2993..1423bbf69c 100644
--- a/test/message/vm_dont_display_syntax_error.out
+++ b/test/message/vm_dont_display_syntax_error.out
@@ -9,9 +9,3 @@ SyntaxError: Unexpected number
     at createScript (node:vm:*)
     at Object.runInThisContext (node:vm:*)
     at Object.<anonymous> (*test*message*vm_dont_display_syntax_error.js:*)
-    at Module._compile (node:internal/modules/cjs/loader:*)
-    at Object.Module._extensions..js (node:internal/modules/cjs/loader:*)
-    at Module.load (node:internal/modules/cjs/loader:*)
-    at Function.Module._load (node:internal/modules/cjs/loader:*)
-    at Function.executeUserEntryPoint [as runMain] (node:internal/modules/run_main:*)
-    at node:internal/main/run_main_module:*:*