Skip to content

Commit f6a1692

Browse files
committed
update getrandom so we do not need permissive-provenance for it
1 parent d9e7a3a commit f6a1692

File tree

2 files changed

+36
-50
lines changed

2 files changed

+36
-50
lines changed

test-cargo-miri/Cargo.lock

Lines changed: 34 additions & 44 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test-cargo-miri/run-test.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -114,16 +114,15 @@ 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.
118117
test("`cargo miri test`",
119118
cargo_miri("test"),
120119
default_ref, "test.stderr-empty.ref",
121-
env={'MIRIFLAGS': "-Zmiri-permissive-provenance -Zmiri-seed=feed"},
120+
env={'MIRIFLAGS': "-Zmiri-seed=feed"},
122121
)
123122
test("`cargo miri test` (no isolation, no doctests)",
124123
cargo_miri("test") + ["--bins", "--tests"], # no `--lib`, we disabled that in `Cargo.toml`
125124
"test.cross-target.stdout.ref", "test.stderr-empty.ref",
126-
env={'MIRIFLAGS': "-Zmiri-permissive-provenance -Zmiri-disable-isolation"},
125+
env={'MIRIFLAGS': "-Zmiri-disable-isolation"},
127126
)
128127
test("`cargo miri test` (with filter)",
129128
cargo_miri("test") + ["--", "--format=pretty", "le1"],
@@ -132,7 +131,6 @@ def test_cargo_miri_test():
132131
test("`cargo miri test` (test target)",
133132
cargo_miri("test") + ["--test", "test", "--", "--format=pretty"],
134133
"test.test-target.stdout.ref", "test.stderr-empty.ref",
135-
env={'MIRIFLAGS': "-Zmiri-permissive-provenance"},
136134
)
137135
test("`cargo miri test` (bin target)",
138136
cargo_miri("test") + ["--bin", "cargo-miri-test", "--", "--format=pretty"],
@@ -150,13 +148,11 @@ def test_cargo_miri_test():
150148
test("`cargo miri test` (custom target dir)",
151149
cargo_miri("test") + ["--target-dir=custom-test"],
152150
default_ref, "test.stderr-empty.ref",
153-
env={'MIRIFLAGS': "-Zmiri-permissive-provenance"},
154151
)
155152
del os.environ["CARGO_TARGET_DIR"] # this overrides `build.target-dir` passed by `--config`, so unset it
156153
test("`cargo miri test` (config-cli)",
157154
cargo_miri("test") + ["--config=build.target-dir=\"config-cli\"", "-Zunstable-options"],
158155
default_ref, "test.stderr-empty.ref",
159-
env={'MIRIFLAGS': "-Zmiri-permissive-provenance"},
160156
)
161157

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

0 commit comments

Comments
 (0)