Fix merge errors

package.json

@@ -16,9 +16,8 @@
     "build": "npx lerna run build",
     "build:changed": "npx lerna run build --since main",
     "test": "npm run ui-test --workspace=extester-test",
-    "coverage": "npm run build && npm run pretest && cd test/test-project && npm run ui-coverage",
-    "test:build": "npm run build && npm install --workspace=extester-test && npm test",
-    "coverage": "npm run build && npm run pretest && npm run ui-coverage --prefix test/test-project"
+    "coverage": "npm run ui-coverage --workspace=extester-test",
+    "test:build": "npm run build && npm install --workspace=extester-test && npm test"
   },
   "workspaces": [
     "packages/*",

packages/extester/package.json

@@ -54,6 +54,7 @@
     "@vscode/vsce": "^2.24.0",
     "@vscode-extension-tester/locators": "^1.0.0",
     "@vscode-extension-tester/page-objects": "^1.0.0",
+    "c8": "^9.1.0",
     "commander": "^12.0.0",
     "compare-versions": "^6.1.0",
     "fs-extra": "^11.2.0",

packages/extester/src/cli.ts

@@ -106,7 +106,7 @@ program.command('setup-and-run <testFiles...>')
     .option('-C, --coverage', 'Enable code coverage using c8')
     .option('-r, --open_resource <resources...>', 'Open resources in VS Code. Multiple files and folders can be specified.')
     .action(withErrors(async (testFiles, cmd) => {
-        const extest = new ExTester(cmd.storage, codeStream(cmd.type), cmd.extensions_dir, cmd.extension_development_path);
+        const extest = new ExTester(cmd.storage, codeStream(cmd.type), cmd.extensions_dir, cmd.extension_development_path, cmd.coverage);
         await extest.setupAndRunTests(testFiles, cmd.code_version, {useYarn: cmd.yarn, installDependencies: cmd.install_dependencies}, {settings: cmd.code_settings, cleanup: cmd.uninstall_extension, config: cmd.mocha_config, logLevel: cmd.log_level, resources: cmd.open_resource ?? []});
     }));
 

tests/test-project/package.json

@@ -184,7 +184,6 @@
 	"devDependencies": {
 		"@types/chai": "^4.3.14",
 		"@types/vscode": "^1.85.0",
-        "c8": "^9.1.0",
 		"chai": "^4.4.1",
 		"clipboard-cli": "^4.0.0",
 		"clipboardy": "^4.0.0",