mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

test: disable CapturableScreen tests on Windows x64 (#41547)

Browse source 
* 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>
This commit is contained in:
trop[bot] 2024-03-08 09:32:34 -05:00 committed by GitHub
parent 64c031f264
commit b45f579eda
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
spec/crash-spec.ts
View file

@ -40,9 +40,13 @@ const shouldRunCase = (crashCase: string) => {
case 'quit-on-crashed-event': { case 'quit-on-crashed-event': {
return (process.platform !== 'win32' || process.arch !== 'ia32'); 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': { 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: { default: {
return true; return true;

6
spec/lib/screen-helpers.ts
View file

@ -171,10 +171,8 @@ export class ScreenCapture {
* - Linux: virtual screen display is 0x0 * - Linux: virtual screen display is 0x0
* - Win32 arm64 (WOA): virtual screen display is 0x0 * - Win32 arm64 (WOA): virtual screen display is 0x0
* - Win32 ia32: skipped * - Win32 ia32: skipped
* - Win32 x64: virtual screen display is 0x0
*/ */
export const hasCapturableScreen = () => { export const hasCapturableScreen = () => {
return ( return process.platform === 'darwin';
process.platform === 'darwin' ||
(process.platform === 'win32' && process.arch === 'x64')
);
}; };