Skip to content

Commit

Permalink
test: disable CapturableScreen tests on Windows x64 (#41547)
Browse files Browse the repository at this point in the history
* test: disable CapturableScreen tests on Windows x64

Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>

* test: disable js-execute-iframe" case should not crash on win 32-bit

Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>

---------

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
  • Loading branch information
trop[bot] and jkleinsc committed Mar 8, 2024
1 parent 64c031f commit b45f579
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
8 changes: 6 additions & 2 deletions spec/crash-spec.ts
Expand Up @@ -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;
Expand Down
6 changes: 2 additions & 4 deletions spec/lib/screen-helpers.ts
Expand Up @@ -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';
};

0 comments on commit b45f579

Please sign in to comment.