diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2021-01-29 15:08:17 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2021-01-29 20:59:09 +0100 |
| commit | 0363655e8b08b4cbc80178fe9cb01a2fb13c446f (patch) | |
| tree | b3538bb4e4a666a6736ee472f29354ff52208e66 | |
| parent | b122908617436af187252572ed5db96850551380 (diff) | |
| download | rust-0363655e8b08b4cbc80178fe9cb01a2fb13c446f.tar.gz rust-0363655e8b08b4cbc80178fe9cb01a2fb13c446f.zip | |
Update test-various to Ubuntu 20.04
The test command-setgroups.rs is adjusted to skip on musl, where `sysconf(_SC_NGROUPS_MAX)` always returns a dummy value of 32, even though the actual value is 65536. I'm not sure why this becomes relevant only now though, as this was apparently the case since kernel 2.6.4.
| -rw-r--r-- | src/ci/docker/host-x86_64/test-various/Dockerfile | 4 | ||||
| -rw-r--r-- | src/test/ui/command/command-setgroups.rs | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/ci/docker/host-x86_64/test-various/Dockerfile b/src/ci/docker/host-x86_64/test-various/Dockerfile index 147de5f8015..f5fe546cdc6 100644 --- a/src/ci/docker/host-x86_64/test-various/Dockerfile +++ b/src/ci/docker/host-x86_64/test-various/Dockerfile @@ -1,6 +1,6 @@ -FROM ubuntu:18.04 +FROM ubuntu:20.04 -RUN apt-get update && apt-get install -y --no-install-recommends \ +RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ g++ \ make \ ninja-build \ diff --git a/src/test/ui/command/command-setgroups.rs b/src/test/ui/command/command-setgroups.rs index 28f2bfdd3a7..2067314f740 100644 --- a/src/test/ui/command/command-setgroups.rs +++ b/src/test/ui/command/command-setgroups.rs @@ -3,6 +3,7 @@ // ignore-cloudabi // ignore-emscripten // ignore-sgx +// ignore-musl - returns dummy result for _SC_NGROUPS_MAX #![feature(rustc_private)] #![feature(setgroups)] |