switch kit?

microsoft · Sep 16, 2024 · 3673965 · 3673965
1 parent 3738ea5
commit 3673965
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/test/unit-tests/driver/cmakeFileApiDriver.test.ts b/test/unit-tests/driver/cmakeFileApiDriver.test.ts
@@ -7,10 +7,6 @@ import { makeCodeModelDriverTestsuite } from './driver-codemodel-tests';
 import { makeDriverTestsuite } from './driver-test';
 
 async function cmakeFileApiDriverFactory(cmake: CMakeExecutable, config: ConfigurationReader, kit: Kit | null, workspaceFolder: string, preconditionHandler: CMakePreconditionProblemSolver, preferredGenerators: CMakeGenerator[]) {
-    if (process.platform === "darwin") {
-        config.updatePartial({ generator: "Unix Makefiles" });
-    }
-
     const d: CMakeFileApiDriver = await CMakeFileApiDriver.create(cmake, config, workspaceFolder || "", false, false, kit, null, null, null, null, null, workspaceFolder, preconditionHandler, preferredGenerators);
     return d;
 }

diff --git a/test/unit-tests/driver/driver-test.ts b/test/unit-tests/driver/driver-test.ts
@@ -43,7 +43,7 @@ export function makeDriverTestsuite(driverName: string, driver_generator: (cmake
                 preferredGenerator: { name: 'Ninja' }
             } as Kit;
         } else {
-            ninjaKitDefault = { name: 'GCC', compilers: { C: 'gcc', CXX: 'g++' }, preferredGenerator: { name: 'Ninja' }, isTrusted: true } as Kit;
+            ninjaKitDefault = { name: 'GCC', compilers: { C: 'gcc', CXX: 'g++' }, preferredGenerator: { name: process.platform === "darwin" ? 'Unix Makefiles' : 'Ninja' }, isTrusted: true } as Kit;
         }
         let secondaryKit: Kit;
         if (process.platform === 'win32') {