mirror of
https://github.com/electron/electron.git
synced 2026-02-06 21:25:10 -05:00
f965b13d74
* chore: bump node in DEPS to v12.16.0 * Fixup asar support setup patch https://github.com/nodejs/node/pull/30862 * Fixup InternalCallbackScope patch https://github.com/nodejs/node/pull/30236 * Fixup GN buildfiles patch https://github.com/nodejs/node/pull/30755 * Fixup low-level hooks patch https://github.com/nodejs/node/pull/30466 * Fixup globals require patch https://github.com/nodejs/node/pull/31643 * Fixup process stream patch https://github.com/nodejs/node/pull/30862 * Fixup js2c modification patch https://github.com/nodejs/node/pull/30755 * Fixup internal fs override patch https://github.com/nodejs/node/pull/30610 * Fixup context-aware warn patch https://github.com/nodejs/node/pull/30336 * Fixup Node.js with ltcg config https://github.com/nodejs/node/pull/29388 * Fixup oaepLabel patch https://github.com/nodejs/node/pull/30917 * Remove redundant ESM test patch https://github.com/nodejs/node/pull/30997 * Remove redundant cli flag patch https://github.com/nodejs/node/pull/30466 * Update filenames.json * Remove macro generation in GN build files https://github.com/nodejs/node/pull/30755 * Fix some compilation errors upstream * Add uvwasi to deps https://github.com/nodejs/node/pull/30258 * Fix BoringSSL incompatibilities * Fixup linked module patch https://github.com/nodejs/node/pull/30274 * Add missing sources to GN uv build https://github.com/libuv/libuv/pull/2347 * Patch some uvwasi incompatibilities * chore: bump Node.js to v12.6.1 * Remove mark_arraybuffer_as_untransferable.patch https://github.com/nodejs/node/pull/30549 * Fix uvwasi build failure on win * Fixup --perf-prof cli option error * Fixup early cjs module loading * fix: initialize diagnostics properly https://github.com/nodejs/node/pull/30025 * Disable new esm syntax specs https://github.com/nodejs/node/pull/30219 * Fixup v8 weakref hook spec https://github.com/nodejs/node/pull/29874 * Fix async context timer issue * Disable monkey-patch-main spec It relies on https://github.com/nodejs/node/pull/29777, and we don't override prepareStackTrace. * Disable new tls specs https://github.com/nodejs/node/pull/23188 We don't support much of TLS owing to schisms between BoringSSL and OpenSSL. Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
39 lines
1.4 KiB
Diff
39 lines
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Shelley Vohr <shelley.vohr@gmail.com>
|
|
Date: Thu, 20 Feb 2020 17:22:58 -0800
|
|
Subject: fix: --perf-prof only works on Linux
|
|
|
|
`--perf-prof`-related flags have been removed in V8 on non-linux devices.
|
|
|
|
See:
|
|
* https://chromium-review.googlesource.com/c/v8/v8/+/1993969
|
|
* https://chromium-review.googlesource.com/c/v8/v8/+/1993978
|
|
|
|
Upstreamed in https://github.com/nodejs/node/pull/31892.
|
|
|
|
diff --git a/test/parallel/test-cli-node-options.js b/test/parallel/test-cli-node-options.js
|
|
index 698f463b627644a85db0fcddfcd471ebd91934e5..63cb22c8693447da94f4ba2f8c4082ea6bf49d6a 100644
|
|
--- a/test/parallel/test-cli-node-options.js
|
|
+++ b/test/parallel/test-cli-node-options.js
|
|
@@ -41,15 +41,14 @@ expect('--trace-event-file-pattern {pid}-${rotation}.trace_events ' +
|
|
'--trace-event-categories node.async_hooks', 'B\n');
|
|
expect('--unhandled-rejections=none', 'B\n');
|
|
|
|
-if (!common.isWindows) {
|
|
+if (common.isLinux) {
|
|
expect('--perf-basic-prof', 'B\n');
|
|
expect('--perf-basic-prof-only-functions', 'B\n');
|
|
-}
|
|
|
|
-if (common.isLinux && ['arm', 'x64'].includes(process.arch)) {
|
|
- // PerfJitLogger is only implemented in Linux.
|
|
- expect('--perf-prof', 'B\n');
|
|
- expect('--perf-prof-unwinding-info', 'B\n');
|
|
+ if (['arm', 'x64'].includes(process.arch)) {
|
|
+ expect('--perf-prof', 'B\n');
|
|
+ expect('--perf-prof-unwinding-info', 'B\n');
|
|
+ }
|
|
}
|
|
|
|
if (common.hasCrypto) {
|