From 3e1c46434369d06026b5b27523a5b21a042fd401 Mon Sep 17 00:00:00 2001 From: Santiago Gimeno Date: Fri, 24 Nov 2023 13:47:32 +0100 Subject: [PATCH] src: NODE_RELEASE should be node So we remain compatible with Node.js. PR-URL: https://github.com/nodesource/nsolid/pull/36 Reviewed-by: Trevor Norris --- src/node_version.h | 2 +- test/message/unhandled_promise_trace_warnings.out | 6 +++--- test/message/v8_warning.out | 2 +- test/parallel/test-process-redirect-warnings-env.js | 2 +- test/parallel/test-process-redirect-warnings.js | 2 +- test/parallel/test-process-release.js | 2 +- test/pseudo-tty/test-tty-color-support-warning-2.out | 2 +- test/pseudo-tty/test-tty-color-support-warning.out | 2 +- test/pseudo-tty/test-tty-color-support.out | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/node_version.h b/src/node_version.h index 4778bfe06d..a4b3681f26 100644 --- a/src/node_version.h +++ b/src/node_version.h @@ -44,7 +44,7 @@ #endif #ifndef NODE_RELEASE -#define NODE_RELEASE "nsolid" +#define NODE_RELEASE "node" #endif #ifndef NODE_TAG diff --git a/test/message/unhandled_promise_trace_warnings.out b/test/message/unhandled_promise_trace_warnings.out index fea340d0fc..a8717d0e13 100644 --- a/test/message/unhandled_promise_trace_warnings.out +++ b/test/message/unhandled_promise_trace_warnings.out @@ -1,4 +1,4 @@ -(nsolid:*) UnhandledPromiseRejectionWarning: Error: This was rejected +(node:*) UnhandledPromiseRejectionWarning: Error: This was rejected at * (*test*message*unhandled_promise_trace_warnings.js:*) at * at * @@ -9,7 +9,7 @@ at * at * at * -(nsolid:*) Error: This was rejected +(node:*) Error: This was rejected at * (*test*message*unhandled_promise_trace_warnings.js:*) at * at * @@ -17,7 +17,7 @@ at * at * at * -(nsolid:*) PromiseRejectionHandledWarning: Promise rejection was handled asynchronously (rejection id: 1) +(node:*) PromiseRejectionHandledWarning: Promise rejection was handled asynchronously (rejection id: 1) at handledRejection (node:internal/process/promises:*) at promiseRejectHandler (node:internal/process/promises:*) at Promise.then * diff --git a/test/message/v8_warning.out b/test/message/v8_warning.out index e6d42dc723..6c419c83cd 100644 --- a/test/message/v8_warning.out +++ b/test/message/v8_warning.out @@ -1,2 +1,2 @@ -(nsolid:*) V8: *v8_warning.js:* Invalid asm.js: Invalid return type +(node:*) V8: *v8_warning.js:* Invalid asm.js: Invalid return type (Use `* --trace-warnings ...` to show where the warning was created) diff --git a/test/parallel/test-process-redirect-warnings-env.js b/test/parallel/test-process-redirect-warnings-env.js index 3df9ca87f2..50abdbf64b 100644 --- a/test/parallel/test-process-redirect-warnings-env.js +++ b/test/parallel/test-process-redirect-warnings-env.js @@ -21,6 +21,6 @@ const warnpath = path.join(tmpdir.path, 'warnings.txt'); fork(warnmod, { env: { ...process.env, NODE_REDIRECT_WARNINGS: warnpath } }) .on('exit', common.mustCall(() => { fs.readFile(warnpath, 'utf8', common.mustSucceed((data) => { - assert.match(data, /\(nsolid:\d+\) Warning: a bad practice warning/); + assert.match(data, /\(node:\d+\) Warning: a bad practice warning/); })); })); diff --git a/test/parallel/test-process-redirect-warnings.js b/test/parallel/test-process-redirect-warnings.js index 72d334e81f..9eb7bbc639 100644 --- a/test/parallel/test-process-redirect-warnings.js +++ b/test/parallel/test-process-redirect-warnings.js @@ -21,6 +21,6 @@ const warnpath = path.join(tmpdir.path, 'warnings.txt'); fork(warnmod, { execArgv: [`--redirect-warnings=${warnpath}`] }) .on('exit', common.mustCall(() => { fs.readFile(warnpath, 'utf8', common.mustSucceed((data) => { - assert.match(data, /\(nsolid:\d+\) Warning: a bad practice warning/); + assert.match(data, /\(node:\d+\) Warning: a bad practice warning/); })); })); diff --git a/test/parallel/test-process-release.js b/test/parallel/test-process-release.js index f8709bff16..4455ad9ca2 100644 --- a/test/parallel/test-process-release.js +++ b/test/parallel/test-process-release.js @@ -5,7 +5,7 @@ require('../common'); const assert = require('assert'); const versionParts = process.versions.node.split('.'); -assert.strictEqual(process.release.name, 'nsolid'); +assert.strictEqual(process.release.name, 'node'); // It's expected that future LTS release lines will have additional // branches in here diff --git a/test/pseudo-tty/test-tty-color-support-warning-2.out b/test/pseudo-tty/test-tty-color-support-warning-2.out index 0c7dd89eaa..37b470a5f1 100644 --- a/test/pseudo-tty/test-tty-color-support-warning-2.out +++ b/test/pseudo-tty/test-tty-color-support-warning-2.out @@ -1,3 +1,3 @@ -(nsolid:*) Warning: The 'NODE_DISABLE_COLORS' env is ignored due to the 'FORCE_COLOR' env being set. +(node:*) Warning: The 'NODE_DISABLE_COLORS' env is ignored due to the 'FORCE_COLOR' env being set. (Use `* --trace-warnings ...` to show where the warning was created) diff --git a/test/pseudo-tty/test-tty-color-support-warning.out b/test/pseudo-tty/test-tty-color-support-warning.out index 95a3e7c3c7..b25d2e42cf 100644 --- a/test/pseudo-tty/test-tty-color-support-warning.out +++ b/test/pseudo-tty/test-tty-color-support-warning.out @@ -1,3 +1,3 @@ -(nsolid:*) Warning: The 'NODE_DISABLE_COLORS' and 'NO_COLOR' env is ignored due to the 'FORCE_COLOR' env being set. +(node:*) Warning: The 'NODE_DISABLE_COLORS' and 'NO_COLOR' env is ignored due to the 'FORCE_COLOR' env being set. (Use `* --trace-warnings ...` to show where the warning was created) diff --git a/test/pseudo-tty/test-tty-color-support.out b/test/pseudo-tty/test-tty-color-support.out index 0765345aeb..df5831c555 100644 --- a/test/pseudo-tty/test-tty-color-support.out +++ b/test/pseudo-tty/test-tty-color-support.out @@ -1,2 +1,2 @@ -(nsolid:*) Warning: The 'NO_COLOR' env is ignored due to the 'FORCE_COLOR' env being set. +(node:*) Warning: The 'NO_COLOR' env is ignored due to the 'FORCE_COLOR' env being set. (Use `* --trace-warnings ...` to show where the warning was created)