Skip to content

Commit ead8cbd

Browse files
committed
Auto merge of #11489 - ehuss:collision-test, r=epage
Fix collision_doc_profile test error This fixes the `collision_doc_profile` test which was sporadically failing on CI. My theory is that the first `common` build finishes quickly (or the other job slot is delayed). The proc-macro `pm` starts (likely very quickly due to pipelining), and it can jump ahead before the second `common` build starts (or at least before the `Message::Run` message gets delivered). The order isn't really important or relevant to this test (all that matters is that "common" shows up twice), so this ignores the order of the messages. cc #11334
2 parents 8607003 + b1bcc9c commit ead8cbd

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

tests/testsuite/collisions.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -355,8 +355,10 @@ fn collision_doc_profile_split() {
355355
.build();
356356

357357
// Just to verify that common is normally built twice.
358+
// This is unordered because in rare cases `pm` may start
359+
// building in-between the two `common`.
358360
p.cargo("build -v")
359-
.with_stderr(
361+
.with_stderr_unordered(
360362
"\
361363
[UPDATING] [..]
362364
[DOWNLOADING] crates ...

0 commit comments

Comments
 (0)