Skip to content

Commit 34361b8

Browse files
author
Paolo Tranquilli
committed
Rust: reorganize options integration tests
1 parent 07c59f7 commit 34361b8

35 files changed

+101
-85
lines changed

rust/ql/integration-tests/options/arch_functions.Darwin.expected

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

rust/ql/integration-tests/options/arch_functions.Linux.expected

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

rust/ql/integration-tests/options/arch_functions.Windows.expected

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

rust/ql/integration-tests/options/arch_functions.ql

Lines changed: 0 additions & 5 deletions
This file was deleted.
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
[workspace]
2+
[package]
3+
name = "cfg"
4+
version = "0.1.0"
5+
edition = "2021"
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
| src/lib.rs:7:1:8:19 | cfg_no_flag |
2+
| src/lib.rs:10:1:11:18 | cfg_no_key |
3+
| src/lib.rs:16:1:17:24 | pointer_width_64 |
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
| src/lib.rs:1:1:2:16 | cfg_flag |
2+
| src/lib.rs:4:1:5:15 | cfg_key |
3+
| src/lib.rs:13:1:14:12 | test |
4+
| src/lib.rs:19:1:20:24 | pointer_width_32 |
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import rust
2+
3+
from Function f
4+
where f.hasExtendedCanonicalPath()
5+
select f

rust/ql/integration-tests/options/src/cfg.rs renamed to rust/ql/integration-tests/options/cfg/src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,8 @@ fn cfg_no_key() {}
1313
#[cfg(test)]
1414
fn test() {}
1515

16+
#[cfg(target_pointer_width = "64")]
17+
fn pointer_width_64() {}
18+
1619
#[cfg(target_pointer_width = "32")]
1720
fn pointer_width_32() {}
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import pytest
2+
import platform
3+
import os
4+
5+
6+
def test_default(codeql, rust):
7+
codeql.database.create()
8+
9+
10+
@pytest.mark.ql_test(expected=".override.expected")
11+
def test_cfg_overrides(codeql, rust):
12+
overrides = ",".join((
13+
"cfg_flag",
14+
"cfg_key=value",
15+
"-target_pointer_width=64",
16+
"target_pointer_width=32",
17+
"test",
18+
))
19+
codeql.database.create(extractor_option=f"cargo_cfg_overrides={overrides}")

0 commit comments

Comments
 (0)