Skip to content

Commit da6d9fd

Browse files
authored
Rollup merge of #135961 - saethlin:skip-less-in-opt-dist, r=jieyouxu
Fix 2/4 tests skipped by opt-dist The linker errors were because this one test, strangely, wants itself compiled with `-Ctarget-features=+crt-static`, and yet it looks like the runner image is simply missing static libraries for libc and libm. Eyeballing the output of ``` rustc +nightly --target=x86_64-pc-windows-msvc -O tests/codegen/vec-shrink-panik.rs --emit=llvm-ir ``` suggests that vec-shrink-panik should pass on Windows. And it's quite disturbing that such a test would have failed only on Windows to start with. Exactly why that was would require some advanced digging, but it looks clean now.
2 parents 448fa11 + 1f4309c commit da6d9fd

File tree

4 files changed

+11
-14
lines changed

4 files changed

+11
-14
lines changed

src/ci/docker/host-aarch64/dist-aarch64-linux/Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ RUN yum upgrade -y && \
2020
gcc-c++ \
2121
git \
2222
glibc-devel \
23+
glibc-static \
2324
libedit-devel \
2425
libstdc++-devel \
2526
make \

src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ RUN yum upgrade -y && \
2121
git \
2222
glibc-devel.i686 \
2323
glibc-devel.x86_64 \
24+
glibc-static.i686 \
25+
glibc-static.x86_64 \
2426
libedit-devel \
2527
libstdc++-devel.i686 \
2628
libstdc++-devel.x86_64 \

src/ci/github-actions/jobs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ envs:
8686
# builds)
8787
# - not running `opt-dist`'s post-optimization smoke tests on the resulting toolchain
8888
#
89-
# If you *want* these to happen however, temporarily uncomment it before triggering a try build.
89+
# If you *want* these to happen however, temporarily comment it before triggering a try build.
9090
DIST_TRY_BUILD: 1
9191

9292
auto:

src/tools/opt-dist/src/main.rs

+7-13
Original file line numberDiff line numberDiff line change
@@ -148,18 +148,15 @@ fn create_environment(args: Args) -> anyhow::Result<(Environment, Vec<String>)>
148148

149149
let is_aarch64 = target_triple.starts_with("aarch64");
150150

151-
let mut skip_tests = vec![
152-
// Fails because of linker errors, as of June 2023.
153-
"tests/ui/process/nofile-limit.rs".to_string(),
154-
];
155-
156-
if is_aarch64 {
157-
skip_tests.extend([
151+
let skip_tests = if is_aarch64 {
152+
vec![
158153
// Those tests fail only inside of Docker on aarch64, as of December 2024
159154
"tests/ui/consts/promoted_running_out_of_memory_issue-130687.rs".to_string(),
160155
"tests/ui/consts/large_const_alloc.rs".to_string(),
161-
]);
162-
}
156+
]
157+
} else {
158+
vec![]
159+
};
163160

164161
let checkout_dir = Utf8PathBuf::from("/checkout");
165162
let env = EnvironmentBuilder::default()
@@ -191,10 +188,7 @@ fn create_environment(args: Args) -> anyhow::Result<(Environment, Vec<String>)>
191188
.build_dir(checkout_dir)
192189
.shared_llvm(false)
193190
.use_bolt(false)
194-
.skipped_tests(vec![
195-
// Fails as of June 2023.
196-
"tests\\codegen\\vec-shrink-panik.rs".to_string(),
197-
])
191+
.skipped_tests(vec![])
198192
.build()?;
199193

200194
(env, shared.build_args)

0 commit comments

Comments
 (0)