From b45f579eda89c5aa98f8c7d3df1efbcd7052b128 Mon Sep 17 00:00:00 2001 From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com> Date: Fri, 8 Mar 2024 09:32:34 -0500 Subject: [PATCH] test: disable CapturableScreen tests on Windows x64 (#41547) * test: disable CapturableScreen tests on Windows x64 Co-authored-by: John Kleinschmidt * test: disable js-execute-iframe" case should not crash on win 32-bit Co-authored-by: John Kleinschmidt --------- Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt --- spec/crash-spec.ts | 8 ++++++-- spec/lib/screen-helpers.ts | 6 ++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/spec/crash-spec.ts b/spec/crash-spec.ts index 7ec747080ddd..6a83b3d3aa63 100644 --- a/spec/crash-spec.ts +++ b/spec/crash-spec.ts @@ -40,9 +40,13 @@ const shouldRunCase = (crashCase: string) => { case 'quit-on-crashed-event': { return (process.platform !== 'win32' || process.arch !== 'ia32'); } - // TODO(jkleinsc) fix this test on Linux on arm/arm64 + // TODO(jkleinsc) fix this test on Linux on arm/arm64 and 32bit windows case 'js-execute-iframe': { - return (process.platform !== 'linux' || (process.arch !== 'arm64' && process.arch !== 'arm')); + if (process.platform === 'win32') { + return process.arch !== 'ia32'; + } else { + return (process.platform !== 'linux' || (process.arch !== 'arm64' && process.arch !== 'arm')); + } } default: { return true; diff --git a/spec/lib/screen-helpers.ts b/spec/lib/screen-helpers.ts index 3c8762c11c52..3dc84bbd80db 100644 --- a/spec/lib/screen-helpers.ts +++ b/spec/lib/screen-helpers.ts @@ -171,10 +171,8 @@ export class ScreenCapture { * - Linux: virtual screen display is 0x0 * - Win32 arm64 (WOA): virtual screen display is 0x0 * - Win32 ia32: skipped + * - Win32 x64: virtual screen display is 0x0 */ export const hasCapturableScreen = () => { - return ( - process.platform === 'darwin' || - (process.platform === 'win32' && process.arch === 'x64') - ); + return process.platform === 'darwin'; };