mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #127280 - ferrocene:hoverbear/disable-rmake-rustdoc-io-error, r=jieyouxu

Browse Source 
Disable rmake test rustdoc-io-error on riscv64gc-gnu

In https://github.com/rust-lang/rust/pull/126917 we disabled `inaccessible-temp-dir` on `riscv64gc-gnu` because the container runs the build as `root` (just like the `armhf-gnu` builds). Tests creating an inaccessible test directory are not possible, since `root` can always touch those directories.

553a69030e/src/ci/docker/host-x86_64/disabled/riscv64gc-gnu/Dockerfile (L99)

This means the tests are run as `root`. As `root`, it's perfectly normal and reasonable to violate permission checks this way:

```bash
$ sudo mkdir scratch
$ sudo chmod o-w scratch
$ sudo mkdir scratch/backs
$
```

Because of this, this PR makes the test ignored on `riscv64gc` (just like on `armhf-gnu`) for now.

As an alternative, I believe the best long-term strategy would be to not run the tests as `root` for this job. Some preliminary exploration was done in https://github.com/rust-lang/rust/pull/126917#issuecomment-2189933970, however that appears a larger lift.

## Testing

> [!NOTE]
> `riscv64gc-unknown-linux-gnu` is a [**Tier 2 with Host Tools** platform](https://doc.rust-lang.org/beta/rustc/platform-support.html), all tests may not necessarily pass! This change should only ignore `inaccessible-temp-dir` and not affect other tests.

You can test out the job locally:

```sh
DEPLOY=1 ./src/ci/docker/run.sh riscv64gc-gnu
```

r? `@jieyouxu`
This commit is contained in:
Matthias Krüger 2024-07-03 23:30:09 +02:00 committed by GitHub
commit 00765e193b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/run-make/inaccessible-temp-dir/rmake.rs
View File

@ -14,7 +14,7 @@
// See https://github.com/rust-lang/rust/issues/66530 // See https://github.com/rust-lang/rust/issues/66530
//@ ignore-riscv64 //@ ignore-riscv64
// FIXME: The riscv build container runs as root, and can always write // FIXME: The riscv64gc-gnu build container runs as root, and can always write
// into `inaccessible/tmp`. Ideally, the riscv64-gnu docker container // into `inaccessible/tmp`. Ideally, the riscv64-gnu docker container
// would use a non-root user, but this leads to issues with // would use a non-root user, but this leads to issues with
// `mkfs.ext4 -d`, as well as mounting a loop device for the rootfs. // `mkfs.ext4 -d`, as well as mounting a loop device for the rootfs.

7
tests/run-make/rustdoc-io-error/rmake.rs
View File

@ -6,8 +6,13 @@
// permissions so that it is not writable. We have to take special care to set // permissions so that it is not writable. We have to take special care to set
// the permissions back to normal so that it's able to be deleted later. // the permissions back to normal so that it's able to be deleted later.
//@ ignore-riscv64
//@ ignore-arm
// FIXME: The riscv64gc-gnu and armhf-gnu build containers run as root,
// and can always write into `inaccessible/tmp`. Ideally, these docker
// containers would use a non-root user, but this leads to issues with
// `mkfs.ext4 -d`, as well as mounting a loop device for the rootfs.
//@ ignore-windows - the `set_readonly` functions doesn't work on folders. //@ ignore-windows - the `set_readonly` functions doesn't work on folders.
//@ ignore-arm - weird file perms on armhf-gnu
use run_make_support::{path, rustdoc}; use run_make_support::{path, rustdoc};
use std::fs; use std::fs;