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

Skip to content

Commit 4fb028c

Browse files
author
Paolo Tranquilli
committed
Rust: accept last integration test changes
Also make `--learn` work with the nested qltest tests.
1 parent e4f982c commit 4fb028c

7 files changed

Lines changed: 8 additions & 7 deletions

File tree

‎rust/ql/integration-tests/qltest/dependencies/functions.expected‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎rust/ql/integration-tests/qltest/dependencies/functions.nested.expected‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
| test.rs:4:1:7:1 | fn foo |

‎rust/ql/integration-tests/qltest/lib/functions.expected‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎rust/ql/integration-tests/qltest/lib/functions.nested.expected‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
| test.rs:1:1:1:11 | fn foo |

‎rust/ql/integration-tests/qltest/main/functions.expected‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎rust/ql/integration-tests/qltest/main/functions.nested.expected‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
| main.rs:1:1:1:12 | fn main |
2+
| test.rs:1:1:1:11 | fn foo |

rust/ql/integration-tests/qltest/test.py renamed to rust/ql/integration-tests/qltest/test_qltest.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,17 @@
66
# (which skips `qltest.{sh,cmd}`)
77

88
@pytest.fixture(autouse=True)
9-
def default_options(codeql, pytestconfig):
9+
def default_options(codeql):
1010
codeql.flags.update(
1111
threads = 1,
1212
show_extractor_output = True,
1313
check_databases = False,
14-
learn = pytestconfig.getoption("learn"),
14+
learn = True,
1515
)
1616

1717
@pytest.mark.parametrize("dir", ["lib", "main", "dependencies"])
18-
def test(codeql, rust, dir):
18+
def test(codeql, rust, expected_files, dir):
19+
expected_files.add(f"{dir}/functions.expected", expected=".nested.expected")
1920
codeql.test.run(dir)
2021

2122
def test_failing_cargo_check(codeql, rust):

0 commit comments

Comments
 (0)