simplify smoketest launch

build/tfs/darwin/smoketest.sh

@@ -25,8 +25,7 @@ function runSmokeTest {
 	SCREENSHOTS="$AGENT_BUILDDIRECTORY/smoketest-screenshots"
 	rm -rf $SCREENSHOTS
 
-	cd $BUILD_SOURCESDIRECTORY/test/smoke && \
-		./node_modules/.bin/mocha --build "$AGENT_BUILDDIRECTORY/VSCode-darwin/Visual Studio Code - Insiders.app/Contents/MacOS/Electron"  --screenshots $SCREENSHOTS
+	npm run smoketest -- --build "$AGENT_BUILDDIRECTORY/VSCode-darwin/Visual Studio Code - Insiders.app"  --screenshots $SCREENSHOTS
 }
 
 step "Run smoke test" \

build/tfs/linux/smoketest.sh

@@ -23,8 +23,7 @@ function configureEnvironment {
 }
 
 function runSmokeTest {
-	DISPLAY=:10 sudo -i -u testuser -- sh -c "cd $BUILD_SOURCESDIRECTORY/test/smoke && ./node_modules/.bin/mocha --build $AGENT_BUILDDIRECTORY/VSCode-linux-x64/code-insiders --screenshots $SCREENSHOTS"
-	#DISPLAY=:10 sudo -i -u testuser -- sh -c "cd /vso/work/2/s/test/smoke && ./node_modules/.bin/mocha --build /vso/work/2/VSCode-linux-x64/code-insiders --screenshots ~/screenshots"
+	DISPLAY=:10 sudo -i -u testuser -- sh -c "cd $BUILD_SOURCESDIRECTORY/test/smoke && ./node_modules/.bin/mocha --build $AGENT_BUILDDIRECTORY/VSCode-linux-x64 --screenshots $SCREENSHOTS"
 }
 
 step "Install dependencies" \

build/tfs/win32/smoketest.ps1

@@ -41,9 +41,7 @@ step "Run smoke test" {
 	$Screenshots = "$env:AGENT_BUILDDIRECTORY\smoketest-screenshots"
 	Remove-Item -Recurse -Force -ErrorAction Ignore $Screenshots
 
-	exec { & Push-Location test\smoke }
-	exec { & .\node_modules\.bin/mocha --build "$env:AGENT_BUILDDIRECTORY\VSCode-win32-$global:arch\Code - Insiders.exe" --screenshots "$Screenshots" }
-	exec { & Pop-Location }
+	exec { & npm run smoketest -- --build "$env:AGENT_BUILDDIRECTORY\VSCode-win32-$global:arch" --screenshots "$Screenshots" }
 }
 
 done
\ No newline at end of file

test/smoke/src/main.ts

@@ -55,14 +55,31 @@ function getDevElectronPath(): string {
 	}
 }
 
+function getBuildElectronPath(root: string): string {
+	switch (process.platform) {
+		case 'darwin':
+			return path.join(root, 'Contents', 'MacOS', 'Electron');
+		case 'linux': {
+			const product = require(path.join(root, 'resources', 'app', 'product.json'));
+			return path.join(root, product.applicationName);
+		}
+		case 'win32': {
+			const product = require(path.join(root, 'resources', 'app', 'product.json'));
+			return path.join(root, `${product.nameShort}.exe`);
+		}
+		default:
+			throw new Error('Unsupported platform.');
+	}
+}
+
 let testCodePath = opts.build;
 let stableCodePath = opts['stable-build'];
 
 if (testCodePath) {
-	process.env.VSCODE_PATH = testCodePath;
+	process.env.VSCODE_PATH = getBuildElectronPath(testCodePath);
 
 	if (stableCodePath) {
-		process.env.VSCODE_STABLE_PATH = stableCodePath;
+		process.env.VSCODE_STABLE_PATH = getBuildElectronPath(stableCodePath);
 	}
 } else {
 	testCodePath = getDevElectronPath();
@@ -72,8 +89,8 @@ if (testCodePath) {
 	process.env.VSCODE_CLI = '1';
 }
 
-if (!fs.existsSync(testCodePath)) {
-	fail(`Can't find Code at ${testCodePath}.`);
+if (!fs.existsSync(process.env.VSCODE_PATH)) {
+	fail(`Can't find Code at ${process.env.VSCODE_PATH}.`);
 }
 
 process.env.VSCODE_USER_DIR = path.join(testDataPath, 'd');