Skip to content

Commit

Permalink
Rollup merge of #71782 - cuviper:leave-dev-null-alone, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
Use a non-existent test path instead of clobbering /dev/null

Fixes #71502.
r? @Mark-Simulacrum
  • Loading branch information
RalfJung authored May 2, 2020
2 parents a9c818e + fbd3fbd commit 2ee49eb
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
10 changes: 7 additions & 3 deletions src/test/ui/non-ice-error-on-worker-io-fail.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@
//
// An attempt to `-o` into a directory we cannot write into should indeed
// be an error; but not an ICE.
//
// However, some folks run tests as root, which can write `/dev/` and end
// up clobbering `/dev/null`. Instead we'll use a non-existent path, which
// also used to ICE, but even root can't magically write there.

// compile-flags: -o /dev/null
// compile-flags: -o /does-not-exist/output

// The error-pattern check occurs *before* normalization, and the error patterns
// are wildly different between build environments. So this is a cop-out (and we
Expand All @@ -15,10 +19,10 @@
// error-pattern: error

// On Mac OS X, we get an error like the below
// normalize-stderr-test "failed to write bytecode to /dev/null.non_ice_error_on_worker_io_fail.*" -> "io error modifying /dev/"
// normalize-stderr-test "failed to write bytecode to /does-not-exist/output.non_ice_error_on_worker_io_fail.*" -> "io error modifying /does-not-exist/"

// On Linux, we get an error like the below
// normalize-stderr-test "couldn't create a temp dir.*" -> "io error modifying /dev/"
// normalize-stderr-test "couldn't create a temp dir.*" -> "io error modifying /does-not-exist/"

// ignore-tidy-linelength
// ignore-windows - this is a unix-specific test
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/non-ice-error-on-worker-io-fail.stderr
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
warning: ignoring --out-dir flag due to -o flag

error: io error modifying /dev/
error: io error modifying /does-not-exist/

error: aborting due to previous error; 1 warning emitted

0 comments on commit 2ee49eb

Please sign in to comment.