Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Re-enable i686-pc-windows-gnu CI #3489

Merged
merged 1 commit into from Dec 19, 2023
Merged

Re-enable i686-pc-windows-gnu CI #3489

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 4 additions & 6 deletions .github/workflows/bors.yml
View file
Open in desktop
Expand Up @@ -73,12 +73,10 @@ jobs:
ARCH_BITS: 64
ARCH: x86_64
- target: x86_64-pc-windows-msvc
# Disabled because broken:
# https://github.com/rust-lang/libc/issues/1592
#- target: i686-pc-windows-gnu
# env:
# ARCH_BITS: 32
# ARCH: i686
- target: i686-pc-windows-gnu
env:
ARCH_BITS: 32
ARCH: i686
- target: i686-pc-windows-msvc
steps:
- uses: rust-lang/simpleinfra/github-actions/cancel-outdated-builds@HEAD
Expand Down
10 changes: 4 additions & 6 deletions .github/workflows/main.yml
View file
Open in desktop
Expand Up @@ -58,12 +58,10 @@ jobs:
ARCH_BITS: 64
ARCH: x86_64
- target: x86_64-pc-windows-msvc
# Disabled because broken:
# https://github.com/rust-lang/libc/issues/1592
#- target: i686-pc-windows-gnu
# env:
# ARCH_BITS: 32
# ARCH: i686
- target: i686-pc-windows-gnu
env:
ARCH_BITS: 32
ARCH: i686
- target: i686-pc-windows-msvc
steps:
- uses: actions/checkout@v4
Expand Down
9 changes: 8 additions & 1 deletion libc-test/build.rs
View file
Open in desktop
Expand Up @@ -618,6 +618,7 @@ fn test_openbsd(target: &str) {
fn test_windows(target: &str) {
assert!(target.contains("windows"));
let gnu = target.contains("gnu");
let i686 = target.contains("i686");

let mut cfg = ctest_cfg();
if target.contains("msvc") {
Expand Down Expand Up @@ -684,14 +685,20 @@ fn test_windows(target: &str) {
cfg.skip_type(move |name| match name {
"SSIZE_T" if !gnu => true,
"ssize_t" if !gnu => true,
// FIXME: The size and alignment of this type are incorrect
"time_t" if gnu && i686 => true,
_ => false,
});

cfg.skip_struct(move |ty| {
if ty.starts_with("__c_anonymous_") {
return true;
}
return false;
match ty {
// FIXME: The size and alignment of this struct are incorrect
"timespec" if gnu && i686 => true,
_ => false,
}
});

cfg.skip_const(move |name| {
Expand Down