Skip to content

Commit e954520

Browse files
committed
Auto merge of #5952 - dwijnand:fix-path-deep_dependencies_trigger_rebuild, r=alexcrichton
Fix path::deep_dependencies_trigger_rebuild often failing in CI A shallow fix for `path::deep_dependencies_trigger_rebuild` in particular as it's failed my PRs often. See #5935 (comment), and #5940 for the bigger picture.
2 parents 9ab347d + 274c162 commit e954520

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

tests/testsuite/path.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -330,11 +330,11 @@ fn deep_dependencies_trigger_rebuild() {
330330
//
331331
// We base recompilation off mtime, so sleep for at least a second to ensure
332332
// that this write will change the mtime.
333-
sleep_ms(1000);
334333
File::create(&p.root().join("baz/src/baz.rs"))
335334
.unwrap()
336335
.write_all(br#"pub fn baz() { println!("hello!"); }"#)
337336
.unwrap();
337+
sleep_ms(1000);
338338
p.cargo("build")
339339
.with_stderr(&format!(
340340
"[COMPILING] baz v0.5.0 (CWD/baz)\n\
@@ -345,7 +345,6 @@ fn deep_dependencies_trigger_rebuild() {
345345
)).run();
346346

347347
// Make sure an update to bar doesn't trigger baz
348-
sleep_ms(1000);
349348
File::create(&p.root().join("bar/src/bar.rs"))
350349
.unwrap()
351350
.write_all(
@@ -354,6 +353,7 @@ fn deep_dependencies_trigger_rebuild() {
354353
pub fn bar() { println!("hello!"); baz::baz(); }
355354
"#,
356355
).unwrap();
356+
sleep_ms(1000);
357357
p.cargo("build")
358358
.with_stderr(&format!(
359359
"[COMPILING] bar v0.5.0 (CWD/bar)\n\

0 commit comments

Comments
 (0)