Skip to content

Commit 9123f0e

Browse files
committed
Auto merge of #1531 - divergentdave:cargo-miri-targets-test, r=RalfJung
Test cargo miri target selection This is a followup to #1525, adding a few test invocations with targets specified in the cargo arguments.
2 parents c2a2e25 + 5d9d75f commit 9123f0e

File tree

3 files changed

+30
-0
lines changed

3 files changed

+30
-0
lines changed

test-cargo-miri/run-test.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ def test_cargo_miri_run():
5050
cargo_miri("run"),
5151
"stdout.ref", "stderr.ref"
5252
)
53+
test("cargo miri run (with target)",
54+
cargo_miri("run") + ["--bin", "cargo-miri-test"],
55+
"stdout.ref", "stderr.ref"
56+
)
5357
test("cargo miri run (with arguments)",
5458
cargo_miri("run") + ["--", "--", "hello world", '"hello world"'],
5559
"stdout.ref", "stderr.ref2"
@@ -68,6 +72,14 @@ def test_cargo_miri_test():
6872
cargo_miri("test") + ["--", "-Zmiri-disable-isolation", "--", "num_cpus"],
6973
"test.stdout.ref3", "test.stderr.ref"
7074
)
75+
test("cargo miri test (test target)",
76+
cargo_miri("test") + ["--test", "test"],
77+
"test.stdout.ref4", "test.stderr.ref"
78+
)
79+
test("cargo miri test (bin target)",
80+
cargo_miri("test") + ["--bin", "cargo-miri-test"],
81+
"test.stdout.ref5", "test.stderr.ref"
82+
)
7183

7284
os.chdir(os.path.dirname(os.path.realpath(__file__)))
7385

test-cargo-miri/test.stdout.ref4

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
2+
running 7 tests
3+
test do_panic ... ok
4+
test does_not_work_on_miri ... ignored
5+
test entropy_rng ... ok
6+
test fail_index_check ... ok
7+
test num_cpus ... ok
8+
test simple1 ... ok
9+
test simple2 ... ok
10+
11+
test result: ok. 6 passed; 0 failed; 1 ignored; 0 measured; 0 filtered out
12+

test-cargo-miri/test.stdout.ref5

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
2+
running 1 test
3+
test test::rng ... ok
4+
5+
test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
6+

0 commit comments

Comments
 (0)