Merge branch 'topic/gnattest' into 'master'

Improve test invocation logging and task provider robustness

See merge request eng/ide/ada_language_server!1944

Author: eliericha

integration/vscode/ada/src/gnattest.ts

@@ -624,7 +624,6 @@ async function handleRunRequestedTests(
             }
             const start = Date.now();
             run.started(test);
-            const cmd = [execPath, '--passed-tests=show', `--routines=${test.id}`];
 
             if (coverage) {
                 /**
@@ -633,7 +632,17 @@ async function handleRunRequestedTests(
                 env['GNATCOV_TRACE_FILE'] = getTracePath(test);
             }
 
-            const driver = logAndRun(run, cmd, env);
+            /**
+             * Use a path relative to the workspace root in the command line to
+             * make log lines shorter.
+             */
+            const cmd = [
+                vscode.workspace.asRelativePath(execPath),
+                '--passed-tests=show',
+                `--routines=${test.id}`,
+            ];
+            const testCwd = vscode.workspace.workspaceFolders![0].uri.fsPath;
+            const driver = logAndRun(run, cmd, env, testCwd);
             const duration = Date.now() - start;
             if (driver.status !== null) {
                 /**
@@ -1117,9 +1126,13 @@ function logAndRun(
     run: vscode.TestRun,
     cmd: string[],
     env?: NodeJS.ProcessEnv,
+    cwd?: string,
 ): cp.SpawnSyncReturns<Buffer> {
     run.appendOutput(`$ ${cmd.map((arg) => `"${arg}"`).join(' ')}\r\n`);
-    return cp.spawnSync(cmd[0], cmd.slice(1), { env: env });
+    return cp.spawnSync(cmd[0], cmd.slice(1), {
+        env: env,
+        cwd: cwd,
+    });
 }
 
 /**

integration/vscode/ada/src/taskProviders.ts

@@ -534,8 +534,19 @@ export class SimpleTaskProvider implements vscode.TaskProvider {
             /**
              * If a test harness project exists, provide a task to build it.
              */
-            const harnessPrj = await getGnatTestDriverProjectPath();
-            if (existsSync(harnessPrj)) {
+            const harnessPrj = await getGnatTestDriverProjectPath().catch(
+                /**
+                 * In case of errors fallback silently to keep providing tasks
+                 * even in case of errors.
+                 */
+                (reason) => {
+                    logger.error(
+                        'Error while querying for the GNATtest test driver project:\n' + reason,
+                    );
+                    return undefined;
+                },
+            );
+            if (harnessPrj && existsSync(harnessPrj)) {
                 taskDeclsToOffer.push({
                     label: TASK_BUILD_TEST_DRIVER,
                     taskDef: {