1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
|
--- electron/spec/api-crash-reporter-spec.ts.orig 2024-10-22 02:29:46 UTC
+++ electron/spec/api-crash-reporter-spec.ts
@@ -14,7 +14,7 @@ const isWindowsOnArm = process.platform === 'win32' &&
import { ifdescribe, ifit, defer, startRemoteControlApp, repeatedly, listen } from './lib/spec-helpers';
const isWindowsOnArm = process.platform === 'win32' && process.arch === 'arm64';
-const isLinuxOnArm = process.platform === 'linux' && process.arch.includes('arm');
+const isLinuxOnArm = ((process.platform === 'linux' || process.platform === 'freebsd') && process.arch.includes('arm'));
type CrashInfo = {
prod: string
@@ -47,7 +47,7 @@ function checkCrash (expectedProcessType: string, fiel
// TODO(nornagon): minidumps are sometimes (not always) turning up empty on
// 32-bit Linux. Figure out why.
- if (!(process.platform === 'linux' && process.arch === 'ia32')) {
+ if (!((process.platform === 'linux' || process.platform === 'freebsd') && process.arch === 'ia32')) {
expect(fields.upload_file_minidump.length).to.be.greaterThan(0);
}
}
@@ -184,7 +184,7 @@ ifdescribe(!isLinuxOnArm && !process.mas && !process.e
// Ensures that passing in crashpadHandlerPID flag for Linx child processes
// does not affect child process args.
- ifit(process.platform === 'linux')('ensure linux child process args are not modified', async () => {
+ ifit(process.platform === 'linux' || process.platform === 'freebsd')('ensure linux child process args are not modified', async () => {
const { port, waitForCrash } = await startServer();
let exitCode: number | null = null;
const appPath = path.join(__dirname, 'fixtures', 'apps', 'crash');
@@ -533,7 +533,7 @@ ifdescribe(!isLinuxOnArm && !process.mas && !process.e
}
}
- const processList = process.platform === 'linux'
+ const processList = (process.platform === 'linux' || process.platform === 'freebsd')
? ['main', 'renderer', 'sandboxed-renderer']
: ['main', 'renderer', 'sandboxed-renderer', 'node'];
for (const crashingProcess of processList) {
@@ -546,7 +546,7 @@ ifdescribe(!isLinuxOnArm && !process.mas && !process.e
return app.getPath('crashDumps');
});
let reportsDir = crashesDir;
- if (process.platform === 'darwin' || process.platform === 'linux') {
+ if (process.platform === 'darwin' || process.platform === 'linux' || process.platform === 'freebsd') {
reportsDir = path.join(crashesDir, 'completed');
} else if (process.platform === 'win32') {
reportsDir = path.join(crashesDir, 'reports');
@@ -570,7 +570,7 @@ ifdescribe(!isLinuxOnArm && !process.mas && !process.e
expect(remoteCrashesDir).to.equal(crashesDir);
let reportsDir = crashesDir;
- if (process.platform === 'darwin' || process.platform === 'linux') {
+ if (process.platform === 'darwin' || process.platform === 'linux' || process.platform === 'freebsd') {
reportsDir = path.join(crashesDir, 'completed');
} else if (process.platform === 'win32') {
reportsDir = path.join(crashesDir, 'reports');
|
