|
 |
cd2e61 |
From fbd3fbdb24563a9d8fd3651f6bdc90bbbbd81d3e Mon Sep 17 00:00:00 2001
|
|
|
cd2e61 |
From: Josh Stone <jistone@redhat.com>
|
|
|
cd2e61 |
Date: Fri, 1 May 2020 16:50:10 -0700
|
|
|
cd2e61 |
Subject: [PATCH] Use a non-existent test path instead of clobbering /dev/null
|
|
|
cd2e61 |
|
|
|
cd2e61 |
---
|
|
|
cd2e61 |
src/test/ui/non-ice-error-on-worker-io-fail.rs | 10 +++++++---
|
|
|
cd2e61 |
src/test/ui/non-ice-error-on-worker-io-fail.stderr | 2 +-
|
|
|
cd2e61 |
2 files changed, 8 insertions(+), 4 deletions(-)
|
|
|
cd2e61 |
|
|
|
cd2e61 |
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
|
|
|
cd2e61 |
index 8af17742850d..30779fc65c0f 100644
|
|
|
cd2e61 |
--- a/src/test/ui/non-ice-error-on-worker-io-fail.rs
|
|
|
cd2e61 |
+++ b/src/test/ui/non-ice-error-on-worker-io-fail.rs
|
|
|
cd2e61 |
@@ -4,8 +4,12 @@
|
|
|
cd2e61 |
//
|
|
|
cd2e61 |
// An attempt to `-o` into a directory we cannot write into should indeed
|
|
|
cd2e61 |
// be an error; but not an ICE.
|
|
|
cd2e61 |
+//
|
|
|
cd2e61 |
+// However, some folks run tests as root, which can write `/dev/` and end
|
|
|
cd2e61 |
+// up clobbering `/dev/null`. Instead we'll use a non-existent path, which
|
|
|
cd2e61 |
+// also used to ICE, but even root can't magically write there.
|
|
|
cd2e61 |
|
|
|
cd2e61 |
-// compile-flags: -o /dev/null
|
|
|
cd2e61 |
+// compile-flags: -o /does-not-exist/output
|
|
|
cd2e61 |
|
|
|
cd2e61 |
// The error-pattern check occurs *before* normalization, and the error patterns
|
|
|
cd2e61 |
// are wildly different between build environments. So this is a cop-out (and we
|
|
|
cd2e61 |
@@ -15,10 +19,10 @@
|
|
|
cd2e61 |
// error-pattern: error
|
|
|
cd2e61 |
|
|
|
cd2e61 |
// On Mac OS X, we get an error like the below
|
|
|
cd2e61 |
-// normalize-stderr-test "failed to write bytecode to /dev/null.non_ice_error_on_worker_io_fail.*" -> "io error modifying /dev/"
|
|
|
cd2e61 |
+// 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/"
|
|
|
cd2e61 |
|
|
|
cd2e61 |
// On Linux, we get an error like the below
|
|
|
cd2e61 |
-// normalize-stderr-test "couldn't create a temp dir.*" -> "io error modifying /dev/"
|
|
|
cd2e61 |
+// normalize-stderr-test "couldn't create a temp dir.*" -> "io error modifying /does-not-exist/"
|
|
|
cd2e61 |
|
|
|
cd2e61 |
// ignore-tidy-linelength
|
|
|
cd2e61 |
// ignore-windows - this is a unix-specific test
|
|
|
cd2e61 |
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
|
|
|
cd2e61 |
index f732abc52b71..edadecf273a7 100644
|
|
|
cd2e61 |
--- a/src/test/ui/non-ice-error-on-worker-io-fail.stderr
|
|
|
cd2e61 |
+++ b/src/test/ui/non-ice-error-on-worker-io-fail.stderr
|
|
|
cd2e61 |
@@ -1,6 +1,6 @@
|
|
|
cd2e61 |
warning: ignoring --out-dir flag due to -o flag
|
|
|
cd2e61 |
|
|
|
cd2e61 |
-error: io error modifying /dev/
|
|
|
cd2e61 |
+error: io error modifying /does-not-exist/
|
|
|
cd2e61 |
|
|
|
cd2e61 |
error: aborting due to previous error; 1 warning emitted
|
|
|
cd2e61 |
|
|
|
cd2e61 |
--
|
|
|
cd2e61 |
2.26.2
|
|
|
cd2e61 |
|