f4ee3c1b2a
* chore: bump node in DEPS to v20.11.0 * module: bootstrap module loaders in shadow realm https://github.com/nodejs/node/pull/48655 * src: add commit hash shorthand in zlib version https://github.com/nodejs/node/pull/50158 * v8,tools: expose necessary V8 defines https://github.com/nodejs/node/pull/50820 * esm: do not call getSource when format is commonjs https://github.com/nodejs/node/pull/50465 * esm: fallback to readFileSync when source is nullish https://github.com/nodejs/node/pull/50825 * vm: allow dynamic import with a referrer realm https://github.com/nodejs/node/pull/50360 * test: skip test-diagnostics-channel-memory-leak.js https://github.com/nodejs/node/pull/50327 * esm: do not call getSource when format is commonjs https://github.com/nodejs/node/pull/50465 * lib: fix assert throwing different error messages in ESM and CJS https://github.com/nodejs/node/pull/50634 * src: fix compatility with upcoming V8 12.1 APIs https://github.com/nodejs/node/pull/50709 * deps: update base64 to 0.5.1 https://github.com/nodejs/node/pull/50629 * src: avoid silent coercion to signed/unsigned int https://github.com/nodejs/node/pull/50663 * src: fix compatility with upcoming V8 12.1 APIs https://github.com/nodejs/node/pull/50709 * chore: fix patch indices * chore: update patches * test: disable TLS cipher test This can't be enabled owing to BoringSSL incompatibilities. https://github.com/nodejs/node/pull/50186 * fix: check for Buffer and global definition in shadow realm https://github.com/nodejs/node/pull/51239 * test: disable parallel/test-shadow-realm-custom-loader Incompatible with our asar logic, resulting in the following failure: > Failed to CompileAndCall electron script: electron/js2c/asar_bundle * chore: remove deleted parallel/test-crypto-modp1-error test * test: make test-node-output-v8-warning generic https://github.com/nodejs/node/pull/50421 * chore: fixup ModuleWrap patch * test: match wpt/streams/transferable/transform-stream-members.any.js to upstream * fix: sandbox is not enabled on arm * chore: disable v8 sandbox on ia32/arm --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> Co-authored-by: Cheng Zhao <zcbenz@gmail.com>
51 lines
2.3 KiB
Diff
51 lines
2.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Shelley Vohr <shelley.vohr@gmail.com>
|
|
Date: Tue, 16 Jan 2024 14:53:31 +0100
|
|
Subject: test: make test-node-output-v8-warning generic
|
|
|
|
Ref https://github.com/nodejs/node/pull/50421.
|
|
|
|
The above CL migrated python snapshot testing to JS, and in the process
|
|
added string replace calls to change 'node' as a hardcoded string to an
|
|
asterisk. This was initially fixed in https://github.com/nodejs/node/pull/36489
|
|
before being regressed in the above, as that PR essentially makes the wildcard
|
|
meaningless. Fix it for now by replacing the process.argv0 basename instead.
|
|
|
|
Some form of fix for this should be upstreamed.
|
|
|
|
diff --git a/test/parallel/test-node-output-v8-warning.mjs b/test/parallel/test-node-output-v8-warning.mjs
|
|
index 8e497739d21c70d5c792f43c268746a200916063..cad1910e020b15775ee16122bc9d310680fed687 100644
|
|
--- a/test/parallel/test-node-output-v8-warning.mjs
|
|
+++ b/test/parallel/test-node-output-v8-warning.mjs
|
|
@@ -2,11 +2,18 @@ import '../common/index.mjs';
|
|
import * as fixtures from '../common/fixtures.mjs';
|
|
import * as snapshot from '../common/assertSnapshot.js';
|
|
import { describe, it } from 'node:test';
|
|
+import { basename } from 'node:path';
|
|
|
|
function replaceNodeVersion(str) {
|
|
return str.replaceAll(process.version, '*');
|
|
}
|
|
|
|
+function replaceExecName(str) {
|
|
+ // Copied from lib/internal/process/warning.js
|
|
+ const baseName = basename(process.argv0 || 'node', '.exe');
|
|
+ return str.replaceAll(`${baseName} --`, '* --');
|
|
+}
|
|
+
|
|
describe('v8 output', { concurrency: true }, () => {
|
|
function normalize(str) {
|
|
return str.replaceAll(snapshot.replaceWindowsPaths(process.cwd()), '')
|
|
@@ -15,10 +22,10 @@ describe('v8 output', { concurrency: true }, () => {
|
|
.replaceAll('*test*', '*')
|
|
.replaceAll(/.*?\*fixtures\*v8\*/g, '(node:*) V8: *') // Replace entire path before fixtures/v8
|
|
.replaceAll('*fixtures*v8*', '*')
|
|
- .replaceAll('node --', '* --');
|
|
}
|
|
+
|
|
const common = snapshot
|
|
- .transform(snapshot.replaceWindowsLineEndings, snapshot.replaceWindowsPaths, replaceNodeVersion);
|
|
+ .transform(snapshot.replaceWindowsLineEndings, snapshot.replaceWindowsPaths, replaceNodeVersion, replaceExecName);
|
|
const defaultTransform = snapshot.transform(common, normalize);
|
|
const tests = [
|
|
{ name: 'v8/v8_warning.js' },
|