Merge branch 'main' into redsun82-rust-analyzer-update

Author: redsun82

CODEOWNERS

@@ -11,7 +11,6 @@
 /go/codeql-tools/ @github/codeql-go @github/code-scanning-language-coverage
 /go/downgrades/ @github/codeql-go @github/code-scanning-language-coverage
 /go/extractor/ @github/codeql-go @github/code-scanning-language-coverage
-/go/extractor-smoke-test/ @github/codeql-go @github/code-scanning-language-coverage
 /go/ql/test/extractor-tests/ @github/codeql-go @github/code-scanning-language-coverage
 /java/ @github/codeql-java
 /javascript/ @github/codeql-javascript

go/Makefile

@@ -58,7 +58,6 @@ test: all build/testdb/check-upgrade-path
 #	use GOOS=linux because GOOS=darwin GOARCH=386 is no longer supported
 	env GOOS=linux GOARCH=386 codeql$(EXE) test run -j0 ql/test/query-tests/Security/CWE-681 --search-path .. --check-diff-informed --consistency-queries ql/consistency-queries --compilation-cache=$(cache) --dynamic-join-order-mode=$(rtjo)
 	cd extractor; $(BAZEL) test ...
-	bash extractor-smoke-test/test.sh || (echo "Extractor smoke test FAILED"; exit 1)
 
 .PHONY: build/testdb/check-upgrade-path
 build/testdb/check-upgrade-path : build/testdb/go.dbscheme ql/lib/go.dbscheme

go/extractor-smoke-test/.gitignore

@@ -5,3 +5,12 @@ def test_traced(codeql, go):
 
 def test_autobuild(codeql, go):
     codeql.database.create(source_root="src", extractor_option = ["extract_tests=true"])
+
+def test_autobuild_traced(codeql, go):
+    # Autobuild under build tracing must produce the same database as untraced
+    # autobuild and explicit traced builds, all checked against test.expected.
+    codeql.database.create(
+        source_root="src",
+        extractor_option = ["extract_tests=true"],
+        _env={"CODEQL_EXTRACTOR_GO_BUILD_TRACING": "on"},
+    )

go/extractor-smoke-test/expected.csv

@@ -109,14 +109,23 @@ impl Config {
         figment.extract().context("loading configuration")
     }
 
+    fn get_extra_env(&self) -> FxHashMap<String, Option<String>> {
+        let mut extra_env = FxHashMap::default();
+        // RUSTUP_AUTO_INSTALL is set to 0 by rust-analyzer (https://github.com/rust-lang/rust-analyzer/issues/20719),
+        // but we do want to allow rustup to auto-install toolchains if needed, so we set it to 1 here.
+        extra_env.insert("RUSTUP_AUTO_INSTALL".to_owned(), Some("1".to_owned()));
+        extra_env.extend(self.cargo_extra_env.clone());
+        extra_env
+    }
+
     fn sysroot(&self, dir: &AbsPath) -> Sysroot {
         let sysroot_input = self.sysroot.as_ref().map(|p| join_path_buf(dir, p));
         let sysroot_src_input = self.sysroot_src.as_ref().map(|p| join_path_buf(dir, p));
         match (sysroot_input, sysroot_src_input) {
-            (None, None) => Sysroot::discover(dir, &self.cargo_extra_env),
+            (None, None) => Sysroot::discover(dir, &self.get_extra_env()),
             (Some(sysroot), None) => Sysroot::discover_rust_lib_src_dir(sysroot),
             (None, Some(sysroot_src)) => {
-                Sysroot::discover_with_src_override(dir, &self.cargo_extra_env, sysroot_src)
+                Sysroot::discover_with_src_override(dir, &self.get_extra_env(), sysroot_src)
             }
             (Some(sysroot), Some(sysroot_src)) => Sysroot::new(Some(sysroot), Some(sysroot_src)),
         }
@@ -167,7 +176,7 @@ impl Config {
                     .map(ToOwned::to_owned)
                     .map(RustLibSource::Path),
 
-                extra_env: self.cargo_extra_env.clone(),
+                extra_env: self.get_extra_env(),
                 extra_args: self.cargo_extra_args.clone(),
                 extra_includes: self
                     .extra_includes

go/extractor-smoke-test/go.mod

@@ -41,9 +41,10 @@ codeql_pkg_files(
 
 codeql_pkg_files(
     name = "extractor-arch",
-    exes = [
-        "//unified/extractor",
-    ] + select_os(
+    exes = select_os(
+        posix = ["//unified/extractor"],
+        windows = ["//unified/extractor-unsupported-os:extractor"],
+    ) + select_os(
         linux = ["//unified/swift-syntax-rs:swift_runtime_libs"],
         otherwise = [],
     ),