Skip to content

Commit

Permalink
Auto merge of rust-lang#135961 - saethlin:skip-less-in-opt-dist, r=<try>
Browse files Browse the repository at this point in the history
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.

I do not have a Windows dev environment to test on right now, but 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.

try-job: dist-aarch64-linux
try-job: dist-x86_64-msvc
  • Loading branch information
bors committed Jan 24, 2025
2 parents 1c9837d + a25126c commit ee5adab
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 15 deletions.
1 change: 1 addition & 0 deletions src/ci/docker/host-aarch64/dist-aarch64-linux/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ RUN yum upgrade -y && \
gcc-c++ \
git \
glibc-devel \
glibc-static \
libedit-devel \
libstdc++-devel \
make \
Expand Down
4 changes: 2 additions & 2 deletions src/ci/github-actions/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ envs:
# builds)
# - not running `opt-dist`'s post-optimization smoke tests on the resulting toolchain
#
# If you *want* these to happen however, temporarily uncomment it before triggering a try build.
DIST_TRY_BUILD: 1
# If you *want* these to happen however, temporarily comment it before triggering a try build.
# DIST_TRY_BUILD: 1

auto:
<<: *production
Expand Down
20 changes: 7 additions & 13 deletions src/tools/opt-dist/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -148,18 +148,15 @@ fn create_environment(args: Args) -> anyhow::Result<(Environment, Vec<String>)>

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

let mut skip_tests = vec![
// Fails because of linker errors, as of June 2023.
"tests/ui/process/nofile-limit.rs".to_string(),
];

if is_aarch64 {
skip_tests.extend([
let skip_tests = if is_aarch64 {
vec![
// Those tests fail only inside of Docker on aarch64, as of December 2024
"tests/ui/consts/promoted_running_out_of_memory_issue-130687.rs".to_string(),
"tests/ui/consts/large_const_alloc.rs".to_string(),
]);
}
]
} else {
vec![]
};

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

(env, shared.build_args)
Expand Down

0 comments on commit ee5adab

Please sign in to comment.