bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix 2/4 tests skipped by opt-dist

Browse source
This commit is contained in:
Ben Kimock 2025-01-23 19:08:37 -05:00
parent 0df0662ee0
commit 1f4309cec4
4 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/ci/docker/host-aarch64/dist-aarch64-linux/Dockerfile
View file

@ -20,6 +20,7 @@ RUN yum upgrade -y && \
gcc-c++ \ gcc-c++ \
git \ git \
glibc-devel \ glibc-devel \
glibc-static \
libedit-devel \ libedit-devel \
libstdc++-devel \ libstdc++-devel \
make \ make \

2
src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile
View file

@ -21,6 +21,8 @@ RUN yum upgrade -y && \
git \ git \
glibc-devel.i686 \ glibc-devel.i686 \
glibc-devel.x86_64 \ glibc-devel.x86_64 \
glibc-static.i686 \
glibc-static.x86_64 \
libedit-devel \ libedit-devel \
libstdc++-devel.i686 \ libstdc++-devel.i686 \
libstdc++-devel.x86_64 \ libstdc++-devel.x86_64 \

2
src/ci/github-actions/jobs.yml
View file

@ -86,7 +86,7 @@ envs:
# builds) # builds)
# - not running `opt-dist`'s post-optimization smoke tests on the resulting toolchain # - 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. # If you *want* these to happen however, temporarily comment it before triggering a try build.
DIST_TRY_BUILD: 1 DIST_TRY_BUILD: 1
auto: auto:

20
src/tools/opt-dist/src/main.rs
View file

@ -148,18 +148,15 @@ fn create_environment(args: Args) -> anyhow::Result<(Environment, Vec<String>)>
let is_aarch64 = target_triple.starts_with("aarch64"); let is_aarch64 = target_triple.starts_with("aarch64");
let mut skip_tests = vec![ let skip_tests = if is_aarch64 {
// Fails because of linker errors, as of June 2023. vec![
"tests/ui/process/nofile-limit.rs".to_string(),
];
if is_aarch64 {
skip_tests.extend([
// Those tests fail only inside of Docker on aarch64, as of December 2024 // 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/promoted_running_out_of_memory_issue-130687.rs".to_string(),
"tests/ui/consts/large_const_alloc.rs".to_string(), "tests/ui/consts/large_const_alloc.rs".to_string(),
]); ]
} } else {
vec![]
};
let checkout_dir = Utf8PathBuf::from("/checkout"); let checkout_dir = Utf8PathBuf::from("/checkout");
let env = EnvironmentBuilder::default() let env = EnvironmentBuilder::default()
@ -191,10 +188,7 @@ fn create_environment(args: Args) -> anyhow::Result<(Environment, Vec<String>)>
.build_dir(checkout_dir) .build_dir(checkout_dir)
.shared_llvm(false) .shared_llvm(false)
.use_bolt(false) .use_bolt(false)
.skipped_tests(vec![ .skipped_tests(vec![])
// Fails as of June 2023.
"tests\\codegen\\vec-shrink-panik.rs".to_string(),
])
.build()?; .build()?;
(env, shared.build_args) (env, shared.build_args)