Skip to content

Commit

Permalink
Unrolled build for rust-lang#127280
Browse files Browse the repository at this point in the history
Rollup merge of rust-lang#127280 - ferrocene:hoverbear/disable-rmake-rustdoc-io-error, r=jieyouxu

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

In rust-lang#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.

https://github.com/rust-lang/rust/blob/553a69030e5a086eb3841d020db8c9c463948c72/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 rust-lang#126917 (comment), 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`
  • Loading branch information
rust-timer authored Jul 4, 2024
2 parents aa1d4f6 + 403e2e2 commit cc0d481
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion tests/run-make/inaccessible-temp-dir/rmake.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
// See https://github.com/rust-lang/rust/issues/66530

//@ 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
// 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.
Expand Down
7 changes: 6 additions & 1 deletion tests/run-make/rustdoc-io-error/rmake.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,13 @@
// 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.

//@ 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-arm - weird file perms on armhf-gnu

use run_make_support::{path, rustdoc};
use std::fs;
Expand Down

0 comments on commit cc0d481

Please sign in to comment.