Thanks to visit codestin.com
Credit goes to github.com

Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
redsun82 merged 2 commits into from
Oct 25, 2024
Merged

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

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e8b6dc
Rust: fix qltest on macOS, and add CI cross-platform testing of it
Oct 25, 2024
4485193
Rust: skip output redirection QL test on windows for now
Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions rust/ql/integration-tests/qltest/failing_cargo_check/does_not_compile.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
fn foo() {
wat
is
this?
}
5 changes: 5 additions & 0 deletions rust/ql/integration-tests/qltest/failing_cargo_check/functions.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import rust

from Function f
where exists(f.getLocation().getFile().getRelativePath())
select f
1 change: 1 addition & 0 deletions rust/ql/integration-tests/qltest/failing_cargo_check/options
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
qltest_cargo_check: true
1 change: 1 addition & 0 deletions rust/ql/integration-tests/qltest/lib/functions.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
| test.rs:1:1:1:11 | foo |
5 changes: 5 additions & 0 deletions rust/ql/integration-tests/qltest/lib/functions.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import rust

from Function f
where exists(f.getLocation().getFile().getRelativePath())
select f
1 change: 1 addition & 0 deletions rust/ql/integration-tests/qltest/lib/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fn foo() {}
2 changes: 2 additions & 0 deletions rust/ql/integration-tests/qltest/main/functions.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
| main.rs:1:1:1:12 | main |
| test.rs:1:1:1:11 | foo |
5 changes: 5 additions & 0 deletions rust/ql/integration-tests/qltest/main/functions.ql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import rust

from Function f
where exists(f.getLocation().getFile().getRelativePath())
select f
1 change: 1 addition & 0 deletions rust/ql/integration-tests/qltest/main/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fn main() {}
1 change: 1 addition & 0 deletions rust/ql/integration-tests/qltest/main/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fn foo() {}
5 changes: 5 additions & 0 deletions rust/ql/integration-tests/qltest/qlpack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
dependencies:
codeql/rust-queries: '*'
codeql/rust-all: '*'
extractor: rust
warnOnImplicitThis: true
14 changes: 14 additions & 0 deletions rust/ql/integration-tests/qltest/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion rust/tools/qltest.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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%"
Expand Down
2 changes: 1 addition & 1 deletion rust/tools/qltest.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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