Skip to content

Commit 44298d8

Browse files
committed
dont add the -Zmiri-seed flag twice
1 parent ccbc035 commit 44298d8

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

tests/compiletest.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ fn compile_fail(path: &str, target: &str, opt: bool) {
6969
run_tests("compile-fail", path, target, flags);
7070
}
7171

72-
fn miri_pass(path: &str, target: &str, opt: bool) {
72+
fn miri_pass(path: &str, target: &str, opt: bool, noseed: bool) {
7373
let opt_str = if opt { " with optimizations" } else { "" };
7474
eprintln!("{}", format!(
7575
"## Running run-pass tests in {} against miri for target {}{}",
@@ -81,7 +81,7 @@ fn miri_pass(path: &str, target: &str, opt: bool) {
8181
let mut flags = Vec::new();
8282
if opt {
8383
flags.push("-Zmir-opt-level=3".to_owned());
84-
} else {
84+
} else if !noseed {
8585
// Run with intptrcast. Avoid test matrix explosion by doing either this or opt-level=3.
8686
flags.push("-Zmiri-seed=".to_owned());
8787
}
@@ -107,7 +107,8 @@ fn get_target() -> String {
107107
}
108108

109109
fn run_pass_miri(opt: bool) {
110-
miri_pass("tests/run-pass", &get_target(), opt);
110+
miri_pass("tests/run-pass", &get_target(), opt, false);
111+
miri_pass("tests/run-pass-noseed", &get_target(), opt, true);
111112
}
112113

113114
fn compile_fail_miri(opt: bool) {
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)