development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-02 17:32:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'aeschli/adoptServerScript'

Browse source
This commit is contained in:
Martin Aeschlimann 2022-01-19 21:31:12 +01:00
parent 1006342354 36089a9229
commit f7baac67c1
No known key found for this signature in database
GPG key ID: 2609A01E695523E3
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
test/automation/src/playwrightDriver.ts
View file

@ -229,7 +229,8 @@ async function launchServer(options: LaunchOptions) {
let serverLocation: string | undefined;
if (codeServerPath) {
serverLocation = join(codeServerPath, `server.${process.platform === 'win32' ? 'cmd' : 'sh'}`);
const { serverApplicationName } = require(join(codeServerPath, 'product.json'));
serverLocation = join(codeServerPath, 'bin', `${serverApplicationName}${process.platform === 'win32' ? '.cmd' : ''}`);
args.push(`--logsPath=${logsPath}`);
logger.log(`Starting built server from '${serverLocation}'`);

3
test/integration/browser/src/index.ts
View file

@ -130,7 +130,8 @@ async function launchServer(browserType: BrowserType): Promise<{ endpoint: url.U
let serverLocation: string;
if (process.env.VSCODE_REMOTE_SERVER_PATH) {
serverLocation = path.join(process.env.VSCODE_REMOTE_SERVER_PATH, `server.${process.platform === 'win32' ? 'cmd' : 'sh'}`);
const { serverApplicationName } = require(path.join(process.env.VSCODE_REMOTE_SERVER_PATH, 'product.json'));
serverLocation = path.join(process.env.VSCODE_REMOTE_SERVER_PATH, 'bin', `${serverApplicationName}${process.platform === 'win32' ? '.cmd' : ''}`);
serverArgs.push(`--logsPath=${logsPath}`);
if (optimist.argv.debug) {