|
1 | 1 | import * as cp from "child_process";
|
2 | 2 | import * as path from "path";
|
| 3 | +import * as os from "os"; |
3 | 4 | import {
|
4 | 5 | downloadAndUnzipVSCode,
|
5 | 6 | resolveCliArgsFromVSCodeExecutablePath,
|
@@ -55,21 +56,24 @@ export async function launchVscodeAndRunTests(extensionTestsPath: string) {
|
55 | 56 | },
|
56 | 57 | );
|
57 | 58 |
|
| 59 | + console.log("finished installing dependency extensions"); |
| 60 | + |
58 | 61 | // Run the integration test
|
59 |
| - await runTests({ |
| 62 | + const code = await runTests({ |
60 | 63 | vscodeExecutablePath,
|
61 | 64 | extensionDevelopmentPath,
|
62 | 65 | extensionTestsPath,
|
63 |
| - // Note: Crash dump causes legacy VSCode to hang, so we just don't bother |
64 |
| - launchArgs: useLegacyVscode |
65 |
| - ? undefined |
66 |
| - : [ |
67 |
| - `--crash-reporter-directory=${crashDir}`, |
68 |
| - `--logsPath=${logsDir}`, |
69 |
| - "--disable-gpu", |
70 |
| - "--disable-software-rasterizer", |
71 |
| - ], |
| 66 | + // Note: Crash dump causes legacy VSCode and Windows to hang, so we just |
| 67 | + // don't bother. Can be re-enabled if we ever need it; on windows it only |
| 68 | + // hangs some of the time, so might be enough to get a crash dump when you |
| 69 | + // need it. |
| 70 | + launchArgs: |
| 71 | + useLegacyVscode || os.platform() === "win32" |
| 72 | + ? undefined |
| 73 | + : [`--crash-reporter-directory=${crashDir}`, `--logsPath=${logsDir}`], |
72 | 74 | });
|
| 75 | + |
| 76 | + console.log(`Returned from "runTests" with value: ${code}`); |
73 | 77 | } catch (err) {
|
74 | 78 | console.error("Test run threw exception:");
|
75 | 79 | console.error(err);
|
|
0 commit comments