Test that CODEQL_RUNNER is not set if CLI sets it

src/tracer-config.test.ts

@@ -5,7 +5,7 @@ import test from "ava";
 
 import * as configUtils from "./config-utils";
 import { Language } from "./languages";
-import { setupTests } from "./testing-utils";
+import { makeVersionInfo, setupTests } from "./testing-utils";
 import { getCombinedTracerConfig } from "./tracer-config";
 import * as util from "./util";
 
@@ -33,7 +33,10 @@ test("getCombinedTracerConfig - return undefined when no languages are traced la
     const config = getTestConfig(tmpDir);
     // No traced languages
     config.languages = [Language.javascript, Language.python];
-    t.deepEqual(await getCombinedTracerConfig(config), undefined);
+    t.deepEqual(
+      await getCombinedTracerConfig(makeVersionInfo("1.0.0"), config),
+      undefined,
+    );
   });
 });
 
@@ -66,7 +69,10 @@ test("getCombinedTracerConfig - with start-tracing.json environment file", async
     );
     fs.writeFileSync(startTracingJson, JSON.stringify(startTracingEnv));
 
-    const result = await getCombinedTracerConfig(config);
+    const result = await getCombinedTracerConfig(
+      makeVersionInfo("1.0.0"),
+      config,
+    );
     t.notDeepEqual(result, undefined);
 
     const expectedEnv = startTracingEnv;
@@ -93,3 +99,42 @@ test("getCombinedTracerConfig - with start-tracing.json environment file", async
     });
   });
 });
+
+test("getCombinedTracerConfig - with SetsCodeqlRunnerEnvVar feature enabled in CLI", async (t) => {
+  await util.withTmpDir(async (tmpDir) => {
+    const config = getTestConfig(tmpDir);
+
+    const bundlePath = path.join(tmpDir, "bundle");
+    const codeqlPlatform =
+      process.platform === "win32"
+        ? "win64"
+        : process.platform === "darwin"
+        ? "osx64"
+        : "linux64";
+    const startTracingEnv = {
+      foo: "bar",
+      CODEQL_DIST: bundlePath,
+      CODEQL_PLATFORM: codeqlPlatform,
+    };
+
+    const tracingEnvironmentDir = path.join(
+      config.dbLocation,
+      "temp",
+      "tracingEnvironment",
+    );
+    fs.mkdirSync(tracingEnvironmentDir, { recursive: true });
+    const startTracingJson = path.join(
+      tracingEnvironmentDir,
+      "start-tracing.json",
+    );
+    fs.writeFileSync(startTracingJson, JSON.stringify(startTracingEnv));
+
+    const result = await getCombinedTracerConfig(
+      makeVersionInfo("1.0.0", { setsCodeqlRunnerEnvVar: true }),
+      config,
+    );
+    t.notDeepEqual(result, undefined);
+
+    t.false(Object.prototype.hasOwnProperty.call(result?.env, "CODEQL_RUNNER"));
+  });
+});