Skip to content

Commit 0643c49

Browse files
committed
Auto merge of #6756 - ehuss:fix-dirty_both_lib_and_test, r=alexcrichton
Fix spurious error in dirty_both_lib_and_test. On HFS, if it runs fast enough, the mtimes will be equal, causing it to fail to rebuild. Seen on #6755 https://travis-ci.com/rust-lang/cargo/jobs/185412514
2 parents d071687 + 0b4303d commit 0643c49

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

tests/testsuite/freshness.rs

+4
Original file line numberDiff line numberDiff line change
@@ -1697,6 +1697,10 @@ fn dirty_both_lib_and_test() {
16971697
.with_stdout_contains("[..]doit assert failure[..]")
16981698
.run();
16991699

1700+
if is_coarse_mtime() {
1701+
// #5918
1702+
sleep_ms(1000);
1703+
}
17001704
// Fix the mistake.
17011705
p.change_file("slib.rs", &slib(1));
17021706

0 commit comments

Comments
 (0)