Skip to content

Commit

Permalink
Auto merge of #11489 - ehuss:collision-test, r=epage
Browse files Browse the repository at this point in the history
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
  • Loading branch information
bors committed Dec 16, 2022
2 parents 8607003 + b1bcc9c commit ead8cbd
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion tests/testsuite/collisions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -355,8 +355,10 @@ fn collision_doc_profile_split() {
.build();

// Just to verify that common is normally built twice.
// This is unordered because in rare cases `pm` may start
// building in-between the two `common`.
p.cargo("build -v")
.with_stderr(
.with_stderr_unordered(
"\
[UPDATING] [..]
[DOWNLOADING] crates ...
Expand Down

0 comments on commit ead8cbd

Please sign in to comment.