Skip to content

Commit

Permalink
Auto merge of #3438 - JohnTitor:unignore-aarch64-linux-android, r=Joh…
Browse files Browse the repository at this point in the history
…nTitor

Unignore `aarch64-linux-android`

Let's see if the NDK update changes something.
  • Loading branch information
bors committed Nov 14, 2023
2 parents 244a68c + 41aaff8 commit 8df2603
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/bors.yml
Expand Up @@ -125,9 +125,7 @@ jobs:
max-parallel: 12
matrix:
target: [
# FIXME: Mysterious failures in CI, see
# https://github.com/rust-lang/libc/issues/2081
# aarch64-linux-android,
aarch64-linux-android,
aarch64-unknown-linux-gnu,
aarch64-unknown-linux-musl,
arm-linux-androideabi,
Expand Down
4 changes: 4 additions & 0 deletions libc-test/build.rs
Expand Up @@ -1544,6 +1544,7 @@ fn test_android(target: &str) {
t => panic!("unsupported target: {}", t),
};
let x86 = target.contains("i686") || target.contains("x86_64");
let aarch64 = target.contains("aarch64");

let mut cfg = ctest_cfg();
cfg.define("_GNU_SOURCE", None);
Expand Down Expand Up @@ -1879,6 +1880,9 @@ fn test_android(target: &str) {
| "SW_MAX"
| "SW_CNT" => true,

// FIXME: aarch64 env cannot find it:
| "PTRACE_GETREGS" if aarch64 => true,

_ => false,
}
});
Expand Down

0 comments on commit 8df2603

Please sign in to comment.