From e9520709461c411a9e4fec8b04f0daf088159e7f Mon Sep 17 00:00:00 2001
From: Eric Huss <eric@huss.org>
Date: Wed, 11 May 2022 14:10:49 -0700
Subject: [PATCH] Fix no_cross_doctests race condition.

---
 tests/testsuite/cross_compile.rs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/tests/testsuite/cross_compile.rs b/tests/testsuite/cross_compile.rs
index f2e6085285f..e3ad7c50ecd 100644
--- a/tests/testsuite/cross_compile.rs
+++ b/tests/testsuite/cross_compile.rs
@@ -594,10 +594,11 @@ fn no_cross_doctests() {
     let target = rustc_host();
     p.cargo("test -v --target")
         .arg(&target)
-        .with_stderr(&format!(
+        // Unordered since the two `rustc` invocations happen concurrently.
+        .with_stderr_unordered(&format!(
             "\
 [COMPILING] foo v0.0.1 ([CWD])
-[RUNNING] `rustc --crate-name foo [..]
+[RUNNING] `rustc --crate-name foo [..]--crate-type lib[..]
 [RUNNING] `rustc --crate-name foo [..]--test[..]
 [FINISHED] test [unoptimized + debuginfo] target(s) in [..]
 [RUNNING] `[CWD]/target/{target}/debug/deps/foo-[..][EXE]`