Merge from vscode e3c4990c67c40213af168300d1cfeb71d680f877 (#16569)

This commit is contained in:
Cory Rivera
2021-08-25 16:28:29 -07:00
committed by GitHub
parent ab1112bfb3
commit cb7b7da0a4
1752 changed files with 59525 additions and 33878 deletions

View File

@@ -25,7 +25,7 @@ app.allowRendererProcessReuse = false;
const optimist = require('optimist')
.describe('grep', 'only run tests matching <pattern>').alias('grep', 'g').alias('grep', 'f').string('grep')
.describe('invert', 'uses the inverse of the match specified by grep').alias('invert', 'i').string('invert')
.describe('invert', 'uses the inverse of the match specified by grep').alias('invert', 'i').string('invert') // {{SQL CARBON EDIT}}
.describe('run', 'only run tests from <file>').string('run')
.describe('runGlob', 'only run tests matching <file_pattern>').alias('runGlob', 'glob').alias('runGlob', 'runGrep').string('runGlob')
.describe('build', 'run with build output (out-build)').boolean('build')
@@ -177,7 +177,6 @@ app.on('ready', () => {
nodeIntegration: true,
contextIsolation: false,
enableWebSQL: false,
enableRemoteModule: false,
spellcheck: false,
nativeWindowOpen: true,
webviewTag: true

View File

@@ -176,6 +176,7 @@ function loadTests(opts) {
// collect unexpected errors
loader.require(['vs/base/common/errors'], function (errors) {
// {{SQL CARBON EDIT}}
global.window.addEventListener('unhandledrejection', event => {
errors.onUnexpectedError(event.reason);
event.preventDefault();
@@ -297,6 +298,7 @@ function runTests(opts) {
return loadTests(opts).then(() => {
if (opts.grep) {
// {{SQL CARBON EDIT}}
mocha.grep(new RegExp(opts.grep));
if (opts.invert) {
mocha.invert();