Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-22 17:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into tyriar/puppeteer

Browse Source
This commit is contained in:
Daniel Imms
2019-07-15 10:34:58 -07:00
parent 76641f06d3 5632c4929f
commit f784f5fd7f
173 changed files with 3112 additions and 1763 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
test/smoke/src/main.ts
View File

@@ -156,7 +156,12 @@ async function setupRepository(): Promise<void> {
console.log('*** Copying test project repository:', opts['test-repo']);
rimraf.sync(workspacePath);
// not platform friendly
cp.execSync(`cp -R "${opts['test-repo']}" "${workspacePath}"`);
if (process.platform === 'win32') {
cp.execSync(`xcopy /E "${opts['test-repo']}" "${workspacePath}"\\*`);
} else {
cp.execSync(`cp -R "${opts['test-repo']}" "${workspacePath}"`);
}
} else {
if (!fs.existsSync(workspacePath)) {
console.log('*** Cloning test project repository...');

8
test/smoke/src/vscode/code.ts
View File

@@ -12,6 +12,7 @@ import { tmpName } from 'tmp';
import { IDriver, connect as connectDriver, IDisposable, IElement, Thenable } from './puppeteer-driver';
import { Logger } from '../logger';
import { ncp } from 'ncp';
import { URI } from 'vscode-uri';
const repoPath = path.join(__dirname, '../../../..');
@@ -129,11 +130,8 @@ export async function spawn(options: SpawnOptions): Promise<Code> {
if (options.remote) {
// Replace workspace path with URI
args.shift();
args.push(
`--${options.workspacePath.endsWith('.code-workspace') ? 'file' : 'folder'}-uri`,
`vscode-remote://test+test${options.workspacePath}`,
);
args[0] = `--${options.workspacePath.endsWith('.code-workspace') ? 'file' : 'folder'}-uri=vscode-remote://test+test/${URI.file(options.workspacePath).path}`;
if (codePath) {
// running against a build: copy the test resolver extension
const testResolverExtPath = path.join(options.extensionsPath, 'vscode-test-resolver');