User test runner improvements

Author: jablko

src/testRunner/externalCompileRunner.ts

@@ -56,12 +56,12 @@ namespace Harness {
                         ts.Debug.assert(!!config.cloneUrl, "Bad format from test.json: cloneUrl field must be present.");
                         const submoduleDir = path.join(cwd, directoryName);
                         if (!fs.existsSync(submoduleDir)) {
-                            exec("git", ["clone", config.cloneUrl, directoryName], { cwd });
+                            exec("git", ["--work-tree", submoduleDir, "clone", config.cloneUrl, path.join(submoduleDir, ".git")], { cwd });
                         }
                         else {
-                            exec("git", ["reset", "HEAD", "--hard"], { cwd: submoduleDir });
-                            exec("git", ["clean", "-f"], { cwd: submoduleDir });
-                            exec("git", ["pull", "-f"], { cwd: submoduleDir });
+                            exec("git", ["--git-dir", path.join(submoduleDir, ".git"), "--work-tree", submoduleDir, "checkout", ":/"], { cwd: submoduleDir });
+                            exec("git", ["--git-dir", path.join(submoduleDir, ".git"), "--work-tree", submoduleDir, "clean", "--force"], { cwd: submoduleDir });
+                            exec("git", ["--git-dir", path.join(submoduleDir, ".git"), "--work-tree", submoduleDir, "pull"], { cwd: submoduleDir });
                         }
 
                         types = config.types;
@@ -81,7 +81,9 @@ namespace Harness {
                     if (types) {
                         args.push("--types", types.join(","));
                         // Also actually install those types (for, eg, the js projects which need node)
-                        exec("npm", ["i", ...types.map(t => `@types/${t}`), "--no-save", "--ignore-scripts"], { cwd: originalCwd, timeout: timeout / 2 }); // NPM shouldn't take the entire timeout - if it takes a long time, it should be terminated and we should log the failure
+                        if (types.length) {
+                            exec("npm", ["i", ...types.map(t => `@types/${t}`), "--no-save", "--ignore-scripts"], { cwd: originalCwd, timeout: timeout / 2 }); // NPM shouldn't take the entire timeout - if it takes a long time, it should be terminated and we should log the failure
+                        }
                     }
                     args.push("--noEmit");
                     Baseline.runBaseline(`${cls.kind()}/${directoryName}.log`, cls.report(cp.spawnSync(`node`, args, { cwd, timeout, shell: true }), cwd));

tests/baselines/reference/user/TypeScript-Vue-Starter.log

@@ -1,4 +1,4 @@
 {
-    "cloneUrl": "https://github.com/Microsoft/TypeScript-React-Starter",
+    "cloneUrl": "https://github.com/Microsoft/TypeScript-React-Starter.git",
     "types": ["jest", "node"]
 }

tests/cases/user/TypeScript-React-Starter/test.json

@@ -1,4 +1,4 @@
 {
     "cloneUrl": "https://github.com/Microsoft/TypeScript-Vue-Starter.git",
-    "types": []
+    "types": ["jest"]
 }

tests/cases/user/TypeScript-Vue-Starter/test.json

@@ -1,4 +1,4 @@
 {
-    "cloneUrl": "https://github.com/Microsoft/TypeScript-React-Starter",
+    "cloneUrl": "https://github.com/Microsoft/TypeScript-WeChat-Starter.git",
     "types": []
 }