Address comments

Author: plemarquand

Diff for: assets/test/.vscode/settings.json

@@ -1,6 +1,6 @@
 {
     "swift.disableAutoResolve": true,
-    "swift.testBuildArguments": [
+    "swift.additionalTestArguments": [
         "-Xswiftc",
         "-DTEST_ARGUMENT_SET_VIA_TEST_BUILD_ARGUMENTS_SETTING"
     ]

Diff for: package.json

@@ -228,9 +228,9 @@
             "items": {
               "type": "string"
             },
-            "markdownDescription": "Additional arguments to pass to `swift build`. Keys and values should be provided as individual entries in the list. If you have created a copy of the build task in `tasks.json` then these build arguments will not be propogated to that task."
+            "markdownDescription": "Additional arguments to pass to `swift` commands such as `swift build`, `swift package`, `swift test`, etc... Keys and values should be provided as individual entries in the list. If you have created a copy of the build task in `tasks.json` then these build arguments will not be propogated to that task."
           },
-          "swift.testBuildArguments": {
+          "swift.additionalTestArguments": {
             "type": "array",
             "default": [],
             "items": {

Diff for: src/configuration.ts

@@ -58,7 +58,7 @@ export interface FolderConfiguration {
     /** Environment variables to set when running tests */
     readonly testEnvironmentVariables: { [key: string]: string };
     /** Extra arguments to set when building tests */
-    readonly testBuildArguments: string[];
+    readonly additionalTestArguments: string[];
     /** search sub-folder of workspace folder for Swift Packages */
     readonly searchSubfoldersForPackages: boolean;
     /** auto-generate launch.json configurations */
@@ -122,10 +122,10 @@ const configuration = {
                     .get<{ [key: string]: string }>("testEnvironmentVariables", {});
             },
             /** Extra arguments to pass to swift test and swift build when running and debugging tests. */
-            get testBuildArguments(): string[] {
+            get additionalTestArguments(): string[] {
                 return vscode.workspace
                     .getConfiguration("swift", workspaceFolder)
-                    .get<string[]>("testBuildArguments", []);
+                    .get<string[]>("additionalTestArguments", []);
             },
             /** auto-generate launch.json configurations */
             get autoGenerateLaunchConfigurations(): boolean {

Diff for: src/debugger/buildConfig.ts

@@ -61,7 +61,7 @@ export class BuildConfigurationFactory {
             if (this.isTestBuild) {
                 additionalArgs = [
                     ...additionalArgs,
-                    ...configuration.folder(this.ctx.workspaceFolder).testBuildArguments,
+                    ...configuration.folder(this.ctx.workspaceFolder).additionalTestArguments,
                 ];
             }
         }
@@ -470,7 +470,10 @@ export class TestingConfigurationFactory {
         }
 
         // Add in any user specified test arguments.
-        result = [...result, ...configuration.folder(this.ctx.workspaceFolder).testBuildArguments];
+        result = [
+            ...result,
+            ...configuration.folder(this.ctx.workspaceFolder).additionalTestArguments,
+        ];
 
         // `link.exe` doesn't support duplicate weak symbols, and lld-link in an effort to
         // match link.exe also doesn't support them by default. We can use `-lldmingw` to get