Skip to content

Commit

Permalink
Fix flaky test
Browse files Browse the repository at this point in the history
Rustdoc writes to a pipe, and if the program on the other side has
exited, it will exit with SIGPIPE. To avoid that happening, call `rustc`
instead of `true`, which will wait to exit until it sees EOF on stdin.

- Use a run-make-fulldeps test so that rustc is available in CI

  This is not exactly right, because the test shouldn't require building
  rustc twice, but it avoids having to build rustdoc for run-make tests.
  • Loading branch information
jyn514 committed Jan 24, 2021
1 parent 1f0fc02 commit 08c01f8
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 6 deletions.
10 changes: 10 additions & 0 deletions src/test/run-make-fulldeps/rustdoc-test-builder/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
-include ../../run-make-fulldeps/tools.mk

# How to manually run this
# $ ./x.py test src/test/run-make/rustdoc-test-builder

all:
# Rustc isn't available in UI tests because the only compiler available is the
# one built from source, which isn't in PATH. This needs to be a run-make
# test so rustc is available.
$(RUSTDOC) --test -Z unstable-options --test-builder $(RUSTC_ORIGINAL) doctest.rs
4 changes: 4 additions & 0 deletions src/test/run-make-fulldeps/rustdoc-test-builder/doctest.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/// ```no_run
/// // This tests that `--test-builder` is accepted as a flag by rustdoc.
/// ```
pub struct Foo;
6 changes: 0 additions & 6 deletions src/test/rustdoc/issue-80893.rs

This file was deleted.

0 comments on commit 08c01f8

Please sign in to comment.