Skip to content

Commit 5d22359

Browse files
committed
Auto merge of #144166 - matthiaskrgr:rollup-wccepuo, r=matthiaskrgr
Rollup of 10 pull requests Successful merges: - rust-lang/rust#141076 (fix Zip unsoundness (again)) - rust-lang/rust#142444 (adding run-make test to autodiff) - rust-lang/rust#143704 (Be a bit more careful around exotic cycles in in the inliner) - rust-lang/rust#144073 (Don't test panic=unwind in panic_main.rs on Fuchsia) - rust-lang/rust#144083 (miri sleep tests: increase slack) - rust-lang/rust#144092 (bootstrap: Detect musl hosts) - rust-lang/rust#144098 (Do not lint private-in-public for RPITIT) - rust-lang/rust#144103 (Rename `emit_unless` to `emit_unless_delay`) - rust-lang/rust#144108 (Ignore tests/run-make/link-eh-frame-terminator/rmake.rs when cross-compiling) - rust-lang/rust#144115 (fix outdated comment) r? `@ghost` `@rustbot` modify labels: rollup
2 parents a7a892a + 3b30b00 commit 5d22359

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

tests/pass-dep/libc/libc-time.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ fn test_nanosleep() {
336336
let remainder = ptr::null_mut::<libc::timespec>();
337337
let is_error = unsafe { libc::nanosleep(&duration_zero, remainder) };
338338
assert_eq!(is_error, 0);
339-
assert!(start_test_sleep.elapsed() < Duration::from_millis(10));
339+
assert!(start_test_sleep.elapsed() < Duration::from_millis(100));
340340

341341
let start_test_sleep = Instant::now();
342342
let duration_100_millis = libc::timespec { tv_sec: 0, tv_nsec: 1_000_000_000 / 10 };
@@ -390,7 +390,7 @@ mod test_clock_nanosleep {
390390
)
391391
};
392392
assert_eq!(error, 0);
393-
assert!(start_test_sleep.elapsed() < Duration::from_millis(10));
393+
assert!(start_test_sleep.elapsed() < Duration::from_millis(100));
394394

395395
let start_test_sleep = Instant::now();
396396
let hunderd_millis_after_start = add_100_millis(timespec_now(libc::CLOCK_MONOTONIC));
@@ -417,7 +417,7 @@ mod test_clock_nanosleep {
417417
libc::clock_nanosleep(libc::CLOCK_MONOTONIC, NO_FLAGS, &duration_zero, remainder)
418418
};
419419
assert_eq!(error, 0);
420-
assert!(start_test_sleep.elapsed() < Duration::from_millis(10));
420+
assert!(start_test_sleep.elapsed() < Duration::from_millis(100));
421421

422422
let start_test_sleep = Instant::now();
423423
let duration_100_millis = libc::timespec { tv_sec: 0, tv_nsec: 1_000_000_000 / 10 };

0 commit comments

Comments
 (0)