Skip to content

Commit 4e4b535

Browse files
committed
test-cargo-miri: permissive provenance should not be needed any more
1 parent cdc7700 commit 4e4b535

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

test-cargo-miri/run-test.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -147,16 +147,15 @@ def test_cargo_miri_test():
147147
default_ref = "test.cross-target.stdout.ref" if is_foreign else "test.default.stdout.ref"
148148
filter_ref = "test.filter.cross-target.stdout.ref" if is_foreign else "test.filter.stdout.ref"
149149

150-
# macOS needs permissive provenance inside getrandom_1.
151150
test("`cargo miri test`",
152151
cargo_miri("test"),
153152
default_ref, "test.stderr-empty.ref",
154-
env={'MIRIFLAGS': "-Zmiri-permissive-provenance -Zmiri-seed=4242"},
153+
env={'MIRIFLAGS': "-Zmiri-seed=4242"},
155154
)
156155
test("`cargo miri test` (no isolation, no doctests)",
157156
cargo_miri("test") + ["--bins", "--tests"], # no `--lib`, we disabled that in `Cargo.toml`
158157
"test.cross-target.stdout.ref", "test.stderr-empty.ref",
159-
env={'MIRIFLAGS': "-Zmiri-permissive-provenance -Zmiri-disable-isolation"},
158+
env={'MIRIFLAGS': "-Zmiri-disable-isolation"},
160159
)
161160
test("`cargo miri test` (with filter)",
162161
cargo_miri("test") + ["--", "--format=pretty", "pl"],
@@ -165,7 +164,6 @@ def test_cargo_miri_test():
165164
test("`cargo miri test` (test target)",
166165
cargo_miri("test") + ["--test", "test", "--", "--format=pretty"],
167166
"test.test-target.stdout.ref", "test.stderr-empty.ref",
168-
env={'MIRIFLAGS': "-Zmiri-permissive-provenance"},
169167
)
170168
test("`cargo miri test` (bin target)",
171169
cargo_miri("test") + ["--bin", "cargo-miri-test", "--", "--format=pretty"],
@@ -183,13 +181,11 @@ def test_cargo_miri_test():
183181
test("`cargo miri test` (custom target dir)",
184182
cargo_miri("test") + ["--target-dir=custom-test"],
185183
default_ref, "test.stderr-empty.ref",
186-
env={'MIRIFLAGS': "-Zmiri-permissive-provenance"},
187184
)
188185
del os.environ["CARGO_TARGET_DIR"] # this overrides `build.target-dir` passed by `--config`, so unset it
189186
test("`cargo miri test` (config-cli)",
190187
cargo_miri("test") + ["--config=build.target-dir=\"config-cli\""],
191188
default_ref, "test.stderr-empty.ref",
192-
env={'MIRIFLAGS': "-Zmiri-permissive-provenance"},
193189
)
194190
if ARGS.multi_target:
195191
test_cargo_miri_multi_target()
@@ -199,7 +195,6 @@ def test_cargo_miri_multi_target():
199195
test("`cargo miri test` (multiple targets)",
200196
cargo_miri("test", targets = ["aarch64-unknown-linux-gnu", "s390x-unknown-linux-gnu"]),
201197
"test.multiple_targets.stdout.ref", "test.stderr-empty.ref",
202-
env={'MIRIFLAGS': "-Zmiri-permissive-provenance"},
203198
)
204199

205200
args_parser = argparse.ArgumentParser(description='`cargo miri` testing')

0 commit comments

Comments
 (0)