about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-09-09 13:33:01 +0000
committerbors <bors@rust-lang.org>2020-09-09 13:33:01 +0000
commitb4bdc07ff5a70175dbcdff7331c557245ddb012f (patch)
tree036d72528f1c96b3a59dbb8ff85c70db3d1b3700 /src/test
parent683d1bcd405727fcc9209f64845bd3b9104878b8 (diff)
parented4dcc04d8957e35da8256f6ffdd1ac574af4a76 (diff)
downloadrust-b4bdc07ff5a70175dbcdff7331c557245ddb012f.tar.gz
rust-b4bdc07ff5a70175dbcdff7331c557245ddb012f.zip
Auto merge of #76445 - jyn514:doctests, r=Mark-Simulacrum,ollie27
Make rustdoc output deterministic for UI tests

Closes https://github.com/rust-lang/rust/issues/76442 (hopefully, since it's non-deterministic I don't have a way to test).

r? `@Mark-Simulacrum`
cc `@GuillaumeGomez`
Diffstat (limited to 'src/test')
-rw-r--r--src/test/rustdoc-ui/failed-doctest-output.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/rustdoc-ui/failed-doctest-output.rs b/src/test/rustdoc-ui/failed-doctest-output.rs
index fcbd7cabc69..90cdb5127be 100644
--- a/src/test/rustdoc-ui/failed-doctest-output.rs
+++ b/src/test/rustdoc-ui/failed-doctest-output.rs
@@ -2,7 +2,7 @@
 // FIXME: if/when the output of the test harness can be tested on its own, this test should be
 // adapted to use that, and that normalize line can go away
 
-// compile-flags:--test
+// compile-flags:--test --test-args --test-threads=1
 // rustc-env:RUST_BACKTRACE=0
 // normalize-stdout-test: "src/test/rustdoc-ui" -> "$$DIR"
 // failure-status: 101