microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-31 00:10:04 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "linux: disable crash reporting in CI (#142572)"

Browse Source 
This reverts commit 7dbd7367dc.
This commit is contained in:
Benjamin Pasero
2022-02-15 16:27:08 +01:00
parent a53624cc51
commit b344f43498
5 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/test-integration.sh
View File

@@ -8,8 +8,7 @@ else
ROOT=$(dirname $(dirname $(readlink -f $0)))
# --disable-dev-shm-usage --use-gl=swiftshader: when run on docker containers where size of /dev/shm
# partition < 64MB which causes OOM failure for chromium compositor that uses the partition for shared memory
# --disable-crash-reporter: TODO@electron this needs Electron 17 to work (https://github.com/microsoft/vscode/issues/142572)
LINUX_EXTRA_ARGS="--disable-dev-shm-usage --use-gl=swiftshader --disable-crash-reporter"
LINUX_EXTRA_ARGS="--disable-dev-shm-usage --use-gl=swiftshader"
fi
VSCODEUSERDATADIR=`mktemp -d 2>/dev/null`

3
scripts/test-remote-integration.sh
View File

@@ -8,8 +8,7 @@ else
ROOT=$(dirname $(dirname $(readlink -f $0)))
# --disable-dev-shm-usage --use-gl=swiftshader: when run on docker containers where size of /dev/shm
# partition < 64MB which causes OOM failure for chromium compositor that uses the partition for shared memory
# --disable-crash-reporter: TODO@electron this needs Electron 17 to work (https://github.com/microsoft/vscode/issues/142572)
LINUX_EXTRA_ARGS="--disable-dev-shm-usage --use-gl=swiftshader --disable-crash-reporter"
LINUX_EXTRA_ARGS="--disable-dev-shm-usage --use-gl=swiftshader"
fi
VSCODEUSERDATADIR=`mktemp -d 2>/dev/null`

3
scripts/test.sh
View File

@@ -8,8 +8,7 @@ else
ROOT=$(dirname $(dirname $(readlink -f $0)))
# --disable-dev-shm-usage --use-gl=swiftshader: when run on docker containers where size of /dev/shm
# partition < 64MB which causes OOM failure for chromium compositor that uses the partition for shared memory
# --disableCrashReporter: TODO@electron this needs Electron 17 to work (https://github.com/microsoft/vscode/issues/142572)
LINUX_EXTRA_ARGS="--disable-dev-shm-usage --use-gl=swiftshader --disableCrashReporter"
LINUX_EXTRA_ARGS="--disable-dev-shm-usage --use-gl=swiftshader"
fi
cd $ROOT

12
src/main.js
View File

@@ -45,14 +45,16 @@ const argvConfig = configureCommandlineSwitchesSync(args);
// Configure crash reporter
perf.mark('code/willStartCrashReporter');
// Disables crash reporting if `disable-crash-reporter` is set.
//
// If a `crash-reporter-directory` is specified we store the crash reports
// If a crash-reporter-directory is specified we store the crash reports
// in the specified directory and don't upload them to the crash server.
//
// Appcenter crash reporting is enabled if
// * `enable-crash-reporter` runtime argument is set to `true`
if (!args['disable-crash-reporter'] && (args['crash-reporter-directory'] || argvConfig['enable-crash-reporter'])) {
// * enable-crash-reporter runtime argument is set to 'true'
// * --disable-crash-reporter command line parameter is not set
//
// Disable crash reporting in all other cases.
if (args['crash-reporter-directory'] ||
(argvConfig['enable-crash-reporter'] && !args['disable-crash-reporter'])) {
configureCrashReporter();
}
perf.mark('code/didStartCrashReporter');

3
test/unit/electron/index.js
View File

@@ -32,7 +32,6 @@ const optimist = require('optimist')
.describe('wait-server', 'port to connect to and wait before running tests')
.describe('timeout', 'timeout for tests')
.describe('crash-reporter-directory', 'crash reporter directory').string('crash-reporter-directory')
.describe('disableCrashReporter', 'disable crash reporter').boolean('disableCrashReporter')
.describe('tfs').string('tfs')
.describe('help', 'show the help').alias('help', 'h');
@@ -44,7 +43,7 @@ if (argv.help) {
}
let crashReporterDirectory = argv['crash-reporter-directory'];
if (crashReporterDirectory && !argv.disableCrashReporter) {
if (crashReporterDirectory) {
crashReporterDirectory = path.normalize(crashReporterDirectory);
if (!path.isAbsolute(crashReporterDirectory)) {