about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--src/tools/miri/test_dependencies/Cargo.toml2
-rw-r--r--src/tools/miri/tests/pass-dep/getrandom_1.rs8
-rw-r--r--src/tools/miri/tests/pass-dep/random.rs8
-rw-r--r--src/tools/miri/tests/pass-dep/shims/libc-getrandom-without-isolation.rs (renamed from src/tools/miri/tests/pass-dep/shims/linux-getrandom-without-isolation.rs)0
-rw-r--r--src/tools/miri/tests/pass-dep/shims/libc-getrandom.rs (renamed from src/tools/miri/tests/pass-dep/shims/linux-getrandom.rs)0
5 files changed, 12 insertions, 6 deletions
diff --git a/src/tools/miri/test_dependencies/Cargo.toml b/src/tools/miri/test_dependencies/Cargo.toml
index 58f731f91d0..d8c70935fb1 100644
--- a/src/tools/miri/test_dependencies/Cargo.toml
+++ b/src/tools/miri/test_dependencies/Cargo.toml
@@ -15,7 +15,7 @@ page_size = "0.4.1"
 num_cpus = "1.10.1"
 
 getrandom_1 = { package = "getrandom", version = "0.1" }
-getrandom_2 = { package = "getrandom", version = "0.2" }
+getrandom = { version = "0.2" }
 rand = { version = "0.8", features = ["small_rng"] }
 
 [workspace]
diff --git a/src/tools/miri/tests/pass-dep/getrandom_1.rs b/src/tools/miri/tests/pass-dep/getrandom_1.rs
new file mode 100644
index 00000000000..2c7bd93fbdb
--- /dev/null
+++ b/src/tools/miri/tests/pass-dep/getrandom_1.rs
@@ -0,0 +1,8 @@
+// mac-os `getrandom_1` does some pointer shenanigans
+//@compile-flags: -Zmiri-permissive-provenance
+
+/// Test old version of `getrandom`.
+fn main() {
+    let mut data = vec![0; 16];
+    getrandom_1::getrandom(&mut data).unwrap();
+}
diff --git a/src/tools/miri/tests/pass-dep/random.rs b/src/tools/miri/tests/pass-dep/random.rs
index 5eccf3b0ea1..0cd8b06d63d 100644
--- a/src/tools/miri/tests/pass-dep/random.rs
+++ b/src/tools/miri/tests/pass-dep/random.rs
@@ -1,12 +1,10 @@
-// mac-os `getrandom_1` does some pointer shenanigans
-//@compile-flags: -Zmiri-permissive-provenance
+//@compile-flags: -Zmiri-strict-provenance
 use rand::{rngs::SmallRng, Rng, SeedableRng};
 
 fn main() {
-    // Test `getrandom` directly (in multiple different versions).
+    // Test `getrandom` directly.
     let mut data = vec![0; 16];
-    getrandom_1::getrandom(&mut data).unwrap();
-    getrandom_2::getrandom(&mut data).unwrap();
+    getrandom::getrandom(&mut data).unwrap();
 
     // Try seeding with "real" entropy.
     let mut rng = SmallRng::from_entropy();
diff --git a/src/tools/miri/tests/pass-dep/shims/linux-getrandom-without-isolation.rs b/src/tools/miri/tests/pass-dep/shims/libc-getrandom-without-isolation.rs
index 349b447569a..349b447569a 100644
--- a/src/tools/miri/tests/pass-dep/shims/linux-getrandom-without-isolation.rs
+++ b/src/tools/miri/tests/pass-dep/shims/libc-getrandom-without-isolation.rs
diff --git a/src/tools/miri/tests/pass-dep/shims/linux-getrandom.rs b/src/tools/miri/tests/pass-dep/shims/libc-getrandom.rs
index a1436c7319d..a1436c7319d 100644
--- a/src/tools/miri/tests/pass-dep/shims/linux-getrandom.rs
+++ b/src/tools/miri/tests/pass-dep/shims/libc-getrandom.rs