Skip to content

Commit

Permalink
add TEST_RESOLVER_USE_SERVER_FROM_SOURCES (#80254)
Browse files Browse the repository at this point in the history
* remove unused deps

* use TEST_RESOLVER_USE_SERVER_FROM_SOURCES
  • Loading branch information
bpasero authored Sep 3, 2019
1 parent 9647d0e commit 7c4afcf
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 714 deletions.
2 changes: 1 addition & 1 deletion extensions/vscode-test-resolver/src/extension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ export function activate(context: vscode.ExtensionContext) {
env['VSCODE_AGENT_FOLDER'] = remoteDataDir;
outputChannel.appendLine(`Using data folder at ${remoteDataDir}`);

if (!commit) { // dev mode
if (!commit || env['TEST_RESOLVER_USE_SERVER_FROM_SOURCES']) { // dev mode
const vscodePath = path.resolve(path.join(context.extensionPath, '..', '..'));
const serverCommandPath = path.join(vscodePath, 'resources', 'server', 'bin-dev', serverCommand);
extHostProcess = cp.spawn(serverCommandPath, commandArgs, { env, cwd: vscodePath });
Expand Down
5 changes: 0 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,6 @@
"cson-parser": "^1.3.3",
"debounce": "^1.0.0",
"documentdb": "^1.5.1",
"electron-mksnapshot": "~2.0.0",
"eslint": "^4.18.2",
"event-stream": "3.3.4",
"express": "^4.13.1",
"fancy-log": "^1.3.3",
Expand All @@ -103,7 +101,6 @@
"gulp-tslint": "^8.1.3",
"gulp-untar": "^0.0.7",
"gulp-vinyl-zip": "^2.1.2",
"husky": "^0.13.1",
"innosetup": "5.6.1",
"is": "^3.1.0",
"istanbul-lib-coverage": "^2.0.5",
Expand All @@ -119,7 +116,6 @@
"mkdirp": "^0.5.0",
"mocha": "^2.2.5",
"mocha-junit-reporter": "^1.17.0",
"opn": "^5.4.0",
"optimist": "0.3.5",
"p-all": "^1.0.0",
"pump": "^1.0.1",
Expand All @@ -140,7 +136,6 @@
"vscode-debugprotocol": "1.36.0",
"vscode-nls-dev": "^3.3.1",
"webpack": "^4.16.5",
"webpack-cli": "^3.1.0",
"webpack-stream": "^5.1.1"
},
"repository": {
Expand Down
Loading

0 comments on commit 7c4afcf

Please sign in to comment.