From 08020d95f7fb6301a32e9fc22dbee7f7f4a6e52b Mon Sep 17 00:00:00 2001
From: Tofik Sonono <tofik.sonono@intel.com>
Date: Thu, 21 Nov 2024 11:19:12 +0100
Subject: [PATCH] Review fixes + disable coverage test on Win

MSVC can not produce gcov based coverage data, therefore the coverage
end-to-end tests are disabled on Windows.
---
 src/coverage.ts                                      |  2 +-
 src/ctest.ts                                         |  4 ++--
 .../single-root-UI/test/coverage.test.ts             | 12 ++++++++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/coverage.ts b/src/coverage.ts
index feb1a10af..b4d4caabe 100644
--- a/src/coverage.ts
+++ b/src/coverage.ts
@@ -6,7 +6,7 @@ import * as logging from '@cmt/logging';
 nls.config({ messageFormat: nls.MessageFormat.bundle, bundleFormat: nls.BundleFormat.standalone })();
 const localize: nls.LocalizeFunc = nls.loadMessageBundle();
 
-const log = logging.createLogger('ctest');
+const log = logging.createLogger('ctest-coverage');
 
 export async function handleCoverageInfoFiles(run: vscode.TestRun, coverageInfoFiles: string[], coverageData: WeakMap<vscode.FileCoverage, vscode.FileCoverageDetail[]>) {
     for (const coverageInfoFile of coverageInfoFiles) {
diff --git a/src/ctest.ts b/src/ctest.ts
index eadabe6dd..455331782 100644
--- a/src/ctest.ts
+++ b/src/ctest.ts
@@ -959,7 +959,7 @@ export class CTestDriver implements vscode.Disposable {
                 if (rc !== 0) {
                     log.error(localize('test.preRunCoverageTargetFailure', 'Building the preRunCoverageTarget \'{0}\' on project in {1} failed. Skipping running tests.', projectCoverageConfig.preRunCoverageTarget, projectCoverageConfig.project.sourceDir));
                     run.end();
-                    return 0;
+                    return rc;
                 }
             }
         }
@@ -970,7 +970,7 @@ export class CTestDriver implements vscode.Disposable {
                 const rc = await projectCoverageConfig.project.build([projectCoverageConfig.postRunCoverageTarget]);
                 if (rc !== 0) {
                     log.error(localize('test.postRunCoverageTargetFailure', 'Building target postRunCoverageTarget on project in {0} failed. Skipping handling of coverage data.', projectCoverageConfig.project.sourceDir));
-                    return 0;
+                    return rc;
                 }
             }
         }
diff --git a/test/end-to-end-tests/single-root-UI/test/coverage.test.ts b/test/end-to-end-tests/single-root-UI/test/coverage.test.ts
index c836c28c4..10bc54682 100644
--- a/test/end-to-end-tests/single-root-UI/test/coverage.test.ts
+++ b/test/end-to-end-tests/single-root-UI/test/coverage.test.ts
@@ -25,6 +25,11 @@ suite('Coverage integration', () => {
 
         testEnv = new DefaultEnvironment('test/end-to-end-tests/single-root-UI/project-folder', build_loc, exe_res);
 
+        if (process.platform === 'win32') {
+            // MSVC compiler does not produce gcov based coverage data
+            return this.skip();
+        }
+
         await vscode.workspace.getConfiguration('cmake', vscode.workspace.workspaceFolders![0].uri).update('useCMakePresets', 'always');
         await vscode.commands.executeCommand('cmake.getSettingsChangePromise');
 
@@ -50,8 +55,11 @@ suite('Coverage integration', () => {
         await vscode.workspace.getConfiguration('cmake', vscode.workspace.workspaceFolders![0].uri).update('postRunCoverageTarget', 'non-existing-target');
 
         testResult = await vscode.commands.executeCommand('testing.coverage.uri', vscode.Uri.file(testEnv.projectFolder.location));
-        expect(testResult['tasks'][0].hasCoverage).to.be.eq(false);
-        expect(testResult['items'][2].computedState).to.be.eq(TestResultState.Unset);
+        if (testResult !== undefined) {
+            // May or may not be undefined in this case evidently based on platform
+            expect(testResult['tasks'][0].hasCoverage).to.be.eq(false);
+            expect(testResult['items'][2].computedState).to.be.eq(TestResultState.Unset);
+        }
     }).timeout(60000);
 
     test('Good Run test with coverage', async () => {