mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Auto merge of #110801 - WaffleLapkin:io-tests, r=jyn514

Browse source 
Fix `ui/io-checks/inaccessbile-temp-dir.rs` test

Fixes #110794

r? `@jyn514`
This commit is contained in:
bors 2023-04-28 00:17:47 +00:00
commit 9a3258fa52
6 changed files with 38 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
tests/run-make/inaccessible-temp-dir/Makefile Normal file
View file

@ -0,0 +1,32 @@
# only-linux
# ignore-arm - linker error on `armhf-gnu`
include ../tools.mk
# Issue #66530: We would ICE if someone compiled with `-o /dev/null`,
# because we would try to generate auxiliary files in `/dev/` (which
# at least the OS X file system rejects).
#
# An attempt to `-Ztemps-dir` 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 an inaccessible path, which
# also used to ICE, but even root can't magically write there.
#
# Note that `-Ztemps-dir` uses `create_dir_all` so it is not sufficient to
# use a directory with non-existing parent like `/does-not-exist/output`.
all:
# Create an inaccessible directory
mkdir $(TMPDIR)/inaccessible
chmod 000 $(TMPDIR)/inaccessible
# Run rustc with `-Ztemps-dir` set to a directory
# *inside* the inaccessible one, so that it can't create it
$(RUSTC) program.rs -Ztemps-dir=$(TMPDIR)/inaccessible/tmp 2>&1 \
| $(CGREP) "failed to find or create the directory specified by `--temps-dir`"
# Make the inaccessible directory accessible,
# so that compiletest can delete the temp dir
chmod +rw $(TMPDIR)/inaccessible

1
tests/run-make/inaccessible-temp-dir/program.rs Normal file
View file

@ -0,0 +1 @@
fn main() {}

39
tests/ui/io-checks/inaccessbile-temp-dir.rs
View file

@ -1,39 +0,0 @@
// Issue #66530: We would ICE if someone compiled with `-o /dev/null`,
// because we would try to generate auxiliary files in `/dev/` (which
// at least the OS X file system rejects).
//
// 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: -Z temps-dir=/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
// rely on the checking of the normalized stderr output as our actual
// "verification" of the diagnostic).
// error-pattern: error
// On Mac OS X, we get an error like the below
// 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 /does-not-exist/"
// ignore-windows - this is a unix-specific test
// ignore-emscripten - the file-system issues do not replicate here
// ignore-wasm - the file-system issues do not replicate here
// ignore-arm - the file-system issues do not replicate here, at least on armhf-gnu
#![crate_type = "lib"]
#![cfg_attr(not(feature = "std"), no_std)]
pub mod task {
pub mod __internal {
use crate::task::Waker;
}
pub use core::task::Waker;
}

4
tests/ui/io-checks/inaccessbile-temp-dir.stderr
View file

@ -1,4 +0,0 @@
error: failed to find or create the directory specified by `--temps-dir`
error: aborting due to previous error

16
tests/ui/io-checks/non-ice-error-on-worker-io-fail.rs
View file

@ -9,7 +9,7 @@
// 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 /does-not-exist/output
// 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
@ -19,22 +19,14 @@
// error-pattern: error
// On Mac OS X, we get an error like the below
// 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/"
// 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 /does-not-exist/"
// normalize-stderr-test "couldn't create a temp dir.*" -> "io error modifying ./does-not-exist/"
// ignore-windows - this is a unix-specific test
// ignore-emscripten - the file-system issues do not replicate here
// ignore-wasm - the file-system issues do not replicate here
// ignore-arm - the file-system issues do not replicate here, at least on armhf-gnu
#![crate_type="lib"]
#![cfg_attr(not(feature = "std"), no_std)]
pub mod task {
pub mod __internal {
use crate::task::Waker;
}
pub use core::task::Waker;
}
#![crate_type = "lib"]

2
tests/ui/io-checks/non-ice-error-on-worker-io-fail.stderr
View file

@ -1,6 +1,6 @@
warning: ignoring --out-dir flag due to -o flag
error: io error modifying /does-not-exist/
error: io error modifying ./does-not-exist/
error: aborting due to previous error; 1 warning emitted