Skip to content

Commit e6a0f3c

Browse files
committed
Auto merge of #81535 - nikic:update-test-various, r=sanxiyn
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 only became a problem now, as the information I found indicates that this value changed in kernel version 2.6.4, which is ages ago. I'm a bit unsure whether this one will go through, because I locally also saw a failure in std-backtrace.rs which went away on subsequent runs, and also had port assignment failures, but I think those might be on my side. I'm kind of curious how the code in https://github.com/rust-lang/rust/blob/b122908617436af187252572ed5db96850551380/library/std/src/net/test.rs#L43-L56 is supposed to work, as the directory names it checks don't seem to appear anywhere else. r? `@Mark-Simulacrum`
2 parents d95d4f0 + 0363655 commit e6a0f3c

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/ci/docker/host-x86_64/test-various/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
FROM ubuntu:18.04
1+
FROM ubuntu:20.04
22

3-
RUN apt-get update && apt-get install -y --no-install-recommends \
3+
RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
44
g++ \
55
make \
66
ninja-build \

src/test/ui/command/command-setgroups.rs

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// ignore-cloudabi
44
// ignore-emscripten
55
// ignore-sgx
6+
// ignore-musl - returns dummy result for _SC_NGROUPS_MAX
67

78
#![feature(rustc_private)]
89
#![feature(setgroups)]

0 commit comments

Comments
 (0)