Skip to content

Commit 3abec0e

Browse files
committed
make macOS happy
1 parent 1a5dfbe commit 3abec0e

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

test-cargo-miri/run-test.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,15 +114,16 @@ def test_cargo_miri_test():
114114
default_ref = "test.cross-target.stdout.ref" if is_foreign else "test.default.stdout.ref"
115115
filter_ref = "test.filter.cross-target.stdout.ref" if is_foreign else "test.filter.stdout.ref"
116116

117+
# macOS needs permissive provenance inside getrandom.
117118
test("`cargo miri test`",
118119
cargo_miri("test"),
119120
default_ref, "test.stderr-empty.ref",
120-
env={'MIRIFLAGS': "-Zmiri-seed=feed"},
121+
env={'MIRIFLAGS': "-Zmiri-permissive-provenance -Zmiri-seed=feed"},
121122
)
122123
test("`cargo miri test` (no isolation, no doctests)",
123124
cargo_miri("test") + ["--bins", "--tests"], # no `--lib`, we disabled that in `Cargo.toml`
124125
"test.cross-target.stdout.ref", "test.stderr-empty.ref",
125-
env={'MIRIFLAGS': "-Zmiri-disable-isolation"},
126+
env={'MIRIFLAGS': "-Zmiri-permissive-provenance -Zmiri-disable-isolation"},
126127
)
127128
test("`cargo miri test` (with filter)",
128129
cargo_miri("test") + ["--", "--format=pretty", "le1"],
@@ -131,6 +132,7 @@ def test_cargo_miri_test():
131132
test("`cargo miri test` (test target)",
132133
cargo_miri("test") + ["--test", "test", "--", "--format=pretty"],
133134
"test.test-target.stdout.ref", "test.stderr-empty.ref",
135+
env={'MIRIFLAGS': "-Zmiri-permissive-provenance"},
134136
)
135137
test("`cargo miri test` (bin target)",
136138
cargo_miri("test") + ["--bin", "cargo-miri-test", "--", "--format=pretty"],
@@ -148,11 +150,13 @@ def test_cargo_miri_test():
148150
test("`cargo miri test` (custom target dir)",
149151
cargo_miri("test") + ["--target-dir=custom-test"],
150152
default_ref, "test.stderr-empty.ref",
153+
env={'MIRIFLAGS': "-Zmiri-permissive-provenance"},
151154
)
152155
del os.environ["CARGO_TARGET_DIR"] # this overrides `build.target-dir` passed by `--config`, so unset it
153156
test("`cargo miri test` (config-cli)",
154157
cargo_miri("test") + ["--config=build.target-dir=\"config-cli\"", "-Zunstable-options"],
155158
default_ref, "test.stderr-empty.ref",
159+
env={'MIRIFLAGS': "-Zmiri-permissive-provenance"},
156160
)
157161

158162
os.chdir(os.path.dirname(os.path.realpath(__file__)))

0 commit comments

Comments
 (0)