Rust: fix qltest on macOS, and add CI cross-platform testing of it

Paolo Tranquilli · Paolo Tranquilli · commit 4e8b6dc03832 · 2024-10-25T12:19:46.000+02:00
diff --git a/rust/ql/integration-tests/qltest/failing_cargo_check/does_not_compile.rs b/rust/ql/integration-tests/qltest/failing_cargo_check/does_not_compile.rs
@@ -0,0 +1,5 @@
+fn foo() {
+    wat
+    is
+    this?
+}
diff --git a/rust/ql/integration-tests/qltest/failing_cargo_check/functions.ql b/rust/ql/integration-tests/qltest/failing_cargo_check/functions.ql
@@ -0,0 +1,5 @@
+import rust
+
+from Function f
+where exists(f.getLocation().getFile().getRelativePath())
+select f
diff --git a/rust/ql/integration-tests/qltest/failing_cargo_check/options b/rust/ql/integration-tests/qltest/failing_cargo_check/options
@@ -0,0 +1 @@
+qltest_cargo_check: true
diff --git a/rust/ql/integration-tests/qltest/lib/functions.expected b/rust/ql/integration-tests/qltest/lib/functions.expected
@@ -0,0 +1 @@
+| test.rs:1:1:1:11 | foo |
diff --git a/rust/ql/integration-tests/qltest/lib/functions.ql b/rust/ql/integration-tests/qltest/lib/functions.ql
@@ -0,0 +1,5 @@
+import rust
+
+from Function f
+where exists(f.getLocation().getFile().getRelativePath())
+select f
diff --git a/rust/ql/integration-tests/qltest/lib/test.rs b/rust/ql/integration-tests/qltest/lib/test.rs
@@ -0,0 +1 @@
+fn foo() {}
diff --git a/rust/ql/integration-tests/qltest/main/functions.expected b/rust/ql/integration-tests/qltest/main/functions.expected
@@ -0,0 +1,2 @@
+| main.rs:1:1:1:12 | main |
+| test.rs:1:1:1:11 | foo |
diff --git a/rust/ql/integration-tests/qltest/main/functions.ql b/rust/ql/integration-tests/qltest/main/functions.ql
@@ -0,0 +1,5 @@
+import rust
+
+from Function f
+where exists(f.getLocation().getFile().getRelativePath())
+select f
diff --git a/rust/ql/integration-tests/qltest/main/main.rs b/rust/ql/integration-tests/qltest/main/main.rs
@@ -0,0 +1 @@
+fn main() {}
diff --git a/rust/ql/integration-tests/qltest/main/test.rs b/rust/ql/integration-tests/qltest/main/test.rs
@@ -0,0 +1 @@
+fn foo() {}
diff --git a/rust/ql/integration-tests/qltest/qlpack.yml b/rust/ql/integration-tests/qltest/qlpack.yml
@@ -0,0 +1,5 @@
+dependencies:
+  codeql/rust-queries: '*'
+  codeql/rust-all: '*'
+extractor: rust
+warnOnImplicitThis: true
diff --git a/rust/ql/integration-tests/qltest/test.py b/rust/ql/integration-tests/qltest/test.py
@@ -0,0 +1,14 @@
+# these tests are meant to exercise QL test running on multiple platforms
+# therefore they don't rely on integration test built-in QL test running
+# (which skips `qltest.{sh,cmd}`)
+
+def test_lib(codeql, rust, cwd):
+    codeql.test.run("lib", threads=1)
+
+def test_main(codeql, rust):
+    codeql.test.run("main", threads=1)
+
+def test_failing_cargo_check(codeql, rust):
+    out = codeql.test.run("failing_cargo_check", threads=1, show_extractor_output=True,
+                          _assert_failure=True, _capture="stderr")
+    assert "requested cargo check failed" in out
diff --git a/rust/tools/qltest.cmd b/rust/tools/qltest.cmd
@@ -3,7 +3,7 @@
 set "RUST_BACKTRACE=full"
 set "QLTEST_LOG=%CODEQL_EXTRACTOR_RUST_LOG_DIR%/qltest.log"
 
-type NUL && "%CODEQL_EXTRACTOR_RUST_ROOT%/tools/%CODEQL_PLATFORM%/extractor" --qltest >"%QLTEST_LOG%"
+type NUL && "%CODEQL_EXTRACTOR_RUST_ROOT%/tools/%CODEQL_PLATFORM%/extractor" --qltest >"%QLTEST_LOG%" 2>&1
 
 if %ERRORLEVEL% neq 0 (
     type "%QLTEST_LOG%"
diff --git a/rust/tools/qltest.sh b/rust/tools/qltest.sh
@@ -4,7 +4,7 @@ set -eu
 
 export RUST_BACKTRACE=full
 QLTEST_LOG="$CODEQL_EXTRACTOR_RUST_LOG_DIR"/qltest.log
-if ! "$CODEQL_EXTRACTOR_RUST_ROOT/tools/$CODEQL_PLATFORM/extractor" --qltest &>> "$QLTEST_LOG"; then
+if ! "$CODEQL_EXTRACTOR_RUST_ROOT/tools/$CODEQL_PLATFORM/extractor" --qltest >> "$QLTEST_LOG" 2>&1; then
   cat "$QLTEST_LOG"
   exit 1
 fi

-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +fn foo() {
 +    wat
 +    is
 +    this?
 +}
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+\| main.rs:1:1:1:12 \| main \|`
	`2`	`+\| test.rs:1:1:1:11 \| foo \|`