From 6111671d456f8287090b635da6df8cf72784011f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Wed, 19 May 2021 18:20:56 +0200 Subject: [PATCH] test: adapt abort tests for new Windows code V8 9.1 changed the way it aborts on uncaught exceptions on Windows. It now uses the code 0x80000003 (exception breakpoint) instead of 0xC0000005 (access violation). Refs: https://github.com/v8/v8/commit/26d85acee2c052aa128b77e2e5fde1d4c9306910 PR-URL: https://github.com/nodejs/node/pull/38273 Backport-PR-URL: https://github.com/nodejs/node/pull/38991 Reviewed-By: Jiawen Geng Reviewed-By: Colin Ihrig Reviewed-By: Antoine du Hamel Reviewed-By: Michael Dawson Reviewed-By: Mary Marchini --- test/abort/test-abort-uncaught-exception.js | 2 +- test/abort/test-worker-abort-uncaught-exception.js | 2 +- test/common/index.js | 6 +++--- test/parallel/test-windows-failed-heap-allocation.js | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/abort/test-abort-uncaught-exception.js b/test/abort/test-abort-uncaught-exception.js index 718f456c9733c6..d2735822401944 100644 --- a/test/abort/test-abort-uncaught-exception.js +++ b/test/abort/test-abort-uncaught-exception.js @@ -28,7 +28,7 @@ function run(flags, argv2, signals) { child.on('exit', common.mustCall(function(code, sig) { if (common.isWindows) { if (signals) - assert.strictEqual(code, 0xC0000005); + assert.strictEqual(code, 0x80000003); else assert.strictEqual(code, 1); } else if (signals) { diff --git a/test/abort/test-worker-abort-uncaught-exception.js b/test/abort/test-worker-abort-uncaught-exception.js index 141e2cacdbe69b..d8f8d1818187b2 100644 --- a/test/abort/test-worker-abort-uncaught-exception.js +++ b/test/abort/test-worker-abort-uncaught-exception.js @@ -16,7 +16,7 @@ const child = spawn(process.execPath, [ ]); child.on('exit', common.mustCall((code, sig) => { if (common.isWindows) { - assert.strictEqual(code, 0xC0000005); + assert.strictEqual(code, 0x80000003); } else { assert(['SIGABRT', 'SIGTRAP', 'SIGILL'].includes(sig), `Unexpected signal ${sig}`); diff --git a/test/common/index.js b/test/common/index.js index 14d47cf0574048..a5d74a3c5b49d6 100644 --- a/test/common/index.js +++ b/test/common/index.js @@ -498,12 +498,12 @@ function nodeProcessAborted(exitCode, signal) { const expectedSignals = ['SIGILL', 'SIGTRAP', 'SIGABRT']; // On Windows, 'aborts' are of 2 types, depending on the context: - // (i) Forced access violation, if --abort-on-uncaught-exception is on - // which corresponds to exit code 3221225477 (0xC0000005) + // (i) Exception breakpoint, if --abort-on-uncaught-exception is on + // which corresponds to exit code 2147483651 (0x80000003) // (ii) Otherwise, _exit(134) which is called in place of abort() due to // raising SIGABRT exiting with ambiguous exit code '3' by default if (isWindows) - expectedExitCodes = [0xC0000005, 134]; + expectedExitCodes = [0x80000003, 134]; // When using --abort-on-uncaught-exception, V8 will use // base::OS::Abort to terminate the process. diff --git a/test/parallel/test-windows-failed-heap-allocation.js b/test/parallel/test-windows-failed-heap-allocation.js index 1681f0d871e416..56a941ce58d072 100644 --- a/test/parallel/test-windows-failed-heap-allocation.js +++ b/test/parallel/test-windows-failed-heap-allocation.js @@ -23,6 +23,6 @@ const cmd = `"${process.execPath}" --max-old-space-size=3 "${__filename}"`; exec(`${cmd} heapBomb`, { cwd: tmpdir.path }, common.mustCall((err) => { const msg = `Wrong exit code of ${err.code}! Expected 134 for abort`; // Note: common.nodeProcessAborted() is not asserted here because it - // returns true on 134 as well as 0xC0000005 (V8's base::OS::Abort) + // returns true on 134 as well as 0x80000003 (V8's base::OS::Abort) assert.strictEqual(err.code, 134, msg); }));