Skip to content

Commit 6e83c99

Browse files
committed
skip old getrandom crate on Solaris
1 parent 6f199e7 commit 6e83c99

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

ci/ci.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -150,11 +150,11 @@ case $HOST_TARGET in
150150
# Partially supported targets (tier 2)
151151
BASIC="empty_main integer heap_alloc libc-mem vec string btreemap" # ensures we have the basics: pre-main code, system allocator
152152
UNIX="hello panic/panic panic/unwind concurrency/simple atomic libc-mem libc-misc libc-random env num_cpus" # the things that are very similar across all Unixes, and hence easily supported there
153-
TEST_TARGET=x86_64-unknown-freebsd run_tests_minimal $BASIC $UNIX hashmap random threadname pthread time fs
154-
TEST_TARGET=i686-unknown-freebsd run_tests_minimal $BASIC $UNIX hashmap random threadname pthread time fs
155-
TEST_TARGET=x86_64-unknown-illumos run_tests_minimal $BASIC $UNIX hashmap thread sync available-parallelism time tls
156-
TEST_TARGET=x86_64-pc-solaris run_tests_minimal $BASIC $UNIX hashmap thread sync available-parallelism time tls
157-
TEST_TARGET=aarch64-linux-android run_tests_minimal $BASIC $UNIX hashmap pthread time --skip threadname
153+
TEST_TARGET=x86_64-unknown-freebsd run_tests_minimal $BASIC $UNIX time hashmap random threadname pthread fs
154+
TEST_TARGET=i686-unknown-freebsd run_tests_minimal $BASIC $UNIX time hashmap random threadname pthread fs
155+
TEST_TARGET=x86_64-unknown-illumos run_tests_minimal $BASIC $UNIX time hashmap random thread sync available-parallelism tls
156+
TEST_TARGET=x86_64-pc-solaris run_tests_minimal $BASIC $UNIX time hashmap random thread sync available-parallelism tls
157+
TEST_TARGET=aarch64-linux-android run_tests_minimal $BASIC $UNIX time hashmap pthread --skip threadname
158158
TEST_TARGET=wasm32-wasip2 run_tests_minimal $BASIC wasm
159159
TEST_TARGET=wasm32-unknown-unknown run_tests_minimal no_std empty_main wasm # this target doesn't really have std
160160
TEST_TARGET=thumbv7em-none-eabihf run_tests_minimal no_std

tests/pass-dep/getrandom.rs

+5
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@
66
/// Test direct calls of getrandom 0.1 and 0.2.
77
fn main() {
88
let mut data = vec![0; 16];
9+
10+
// Old Solaris had a different return type for `getrandom`, and old versions of the getrandom crate
11+
// used that signature, which Miri is not happy about.
12+
#[cfg(not(target_os = "solaris"))]
913
getrandom_01::getrandom(&mut data).unwrap();
14+
1015
getrandom_02::getrandom(&mut data).unwrap();
1116
}

0 commit comments

Comments
 (0)