From fbd3fbdb24563a9d8fd3651f6bdc90bbbbd81d3e Mon Sep 17 00:00:00 2001

From: Josh Stone <jistone@redhat.com>

Date: Fri, 1 May 2020 16:50:10 -0700

Subject: [PATCH] Use a non-existent test path instead of clobbering /dev/null

---

 src/test/ui/non-ice-error-on-worker-io-fail.rs     | 10 +++++++---

 src/test/ui/non-ice-error-on-worker-io-fail.stderr |  2 +-

 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/test/ui/non-ice-error-on-worker-io-fail.rs b/src/test/ui/non-ice-error-on-worker-io-fail.rs

index 8af17742850d..30779fc65c0f 100644

--- a/src/test/ui/non-ice-error-on-worker-io-fail.rs

+++ b/src/test/ui/non-ice-error-on-worker-io-fail.rs

@@ -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

@@ -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

diff --git a/src/test/ui/non-ice-error-on-worker-io-fail.stderr b/src/test/ui/non-ice-error-on-worker-io-fail.stderr

index f732abc52b71..edadecf273a7 100644

--- a/src/test/ui/non-ice-error-on-worker-io-fail.stderr

+++ b/src/test/ui/non-ice-error-on-worker-io-fail.stderr

@@ -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

-- 

2.26.2