Skip to content

Commit

Permalink
Merge branch 'main' into illumos-aio
Browse files Browse the repository at this point in the history
  • Loading branch information
Berrysoft authored Nov 13, 2024
2 parents 2b4e11d + c025f57 commit 5ecb911
Show file tree
Hide file tree
Showing 4 changed files with 163 additions and 5 deletions.
9 changes: 9 additions & 0 deletions libc-test/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2027,6 +2027,15 @@ fn test_android(target: &str) {
// Added in API level 28, but some tests use level 24.
"aligned_alloc" => true,

// Added in API level 26, but some tests use level 24.
"getgrent" => true,

// Added in API level 26, but some tests use level 24.
"setgrent" => true,

// Added in API level 26, but some tests use level 24.
"endgrent" => true,

// FIXME: bad function pointers:
"isalnum" | "isalpha" | "iscntrl" | "isdigit" | "isgraph" | "islower" | "isprint"
| "ispunct" | "isspace" | "isupper" | "isxdigit" | "isblank" | "tolower"
Expand Down
3 changes: 3 additions & 0 deletions libc-test/semver/android.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3223,6 +3223,7 @@ dlsym
dup
dup2
duplocale
endgrent
endservent
epoll_create
epoll_create1
Expand Down Expand Up @@ -3327,6 +3328,7 @@ getegid
getenv
geteuid
getgid
getgrent
getgrgid
getgrgid_r
getgrnam
Expand Down Expand Up @@ -3724,6 +3726,7 @@ seteuid
setfsgid
setfsuid
setgid
setgrent
setgroups
sethostname
setlocale
Expand Down
3 changes: 3 additions & 0 deletions src/unix/linux_like/android/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3679,6 +3679,9 @@ safe_f! {
}

extern "C" {
pub fn setgrent();
pub fn endgrent();
pub fn getgrent() -> *mut ::group;
pub fn getrlimit64(resource: ::c_int, rlim: *mut rlimit64) -> ::c_int;
pub fn setrlimit64(resource: ::c_int, rlim: *const rlimit64) -> ::c_int;
pub fn getrlimit(resource: ::c_int, rlim: *mut ::rlimit) -> ::c_int;
Expand Down
153 changes: 148 additions & 5 deletions triagebot.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ allow-unauthenticated = [
"stable-nominated",
]

[autolabel."S-waiting-on-review"]
new_pr = true

[assign]
contributing_url = "https://github.com/rust-lang/libc/blob/HEAD/CONTRIBUTING.md"

Expand All @@ -18,6 +15,154 @@ contributing_url = "https://github.com/rust-lang/libc/blob/HEAD/CONTRIBUTING.md"
"@tgross35",
]

[autolabel."S-waiting-on-review"]
new_pr = true

[autolabel."O-android"]
trigger_files = ["src/unix/linux_like/android"]

[autolabel."O-arm"]
trigger_files = [
"src/solid/arm.rs",
"src/unix/bsd/freebsdlike/freebsd/arm.rs",
"src/unix/bsd/netbsdlike/netbsd/arm.rs",
"src/unix/bsd/netbsdlike/openbsd/arm.rs",
"src/unix/linux_like/android/b32/arm.rs",
"src/unix/linux_like/linux/gnu/b32/arm/",
"src/unix/linux_like/linux/musl/b32/arm/",
"src/unix/linux_like/linux/uclibc/arm/",
"src/unix/newlib/arm/",
"src/vxworks/arm.rs",
]

[autolabel."O-bsd"]
trigger_files = ["src/unix/bsd/mod.rs"]

[autolabel."O-dragonfly"]
trigger_files = ["src/unix/bsd/freebsdlike/dragonfly"]

[autolabel."O-gnu"]
trigger_files = [
"src/unix/linux_like/linux/gnu",
"src/windows/gnu",
]

[autolabel."O-illumos"]
trigger_files = ["src/unix/solarish/illumos.rs"]

[autolabel."O-linux"]
trigger_files = ["src/unix/linux_like/linux"]

[autolabel."O-linux-like"]
trigger_files = ["src/unix/linux_like/mod.rs"]

[autolabel."O-macos"]
trigger_files = ["src/unix/bsd/apple"]

[autolabel."O-mips"]
trigger_files = [
"src/unix/bsd/netbsdlike/netbsd/mips.rs",
"src/unix/bsd/netbsdlike/openbsd/mips64.rs",
"src/unix/linux_like/linux/arch/mips",
"src/unix/linux_like/linux/gnu/b32/mips",
"src/unix/linux_like/linux/gnu/b64/mips64",
"src/unix/linux_like/linux/musl/b32/mips",
"src/unix/linux_like/linux/musl/b64/mips64.rs",
"src/unix/linux_like/linux/uclibc/mips",
]

[autolabel."O-musl"]
trigger_files = ["src/unix/linux_like/linux/musl"]

[autolabel."O-newlib"]
trigger_files = ["src/unix/newlib"]

[autolabel."O-redox"]
trigger_files = ["src/unix/redox"]

[autolabel."O-riscv"]
trigger_files = [
"src/fuchsia/riscv64.rs",
"src/unix/bsd/freebsdlike/freebsd/riscv64.rs",
"src/unix/bsd/netbsdlike/netbsd/riscv64.rs",
"src/unix/bsd/netbsdlike/openbsd/riscv64.rs",
"src/unix/linux_like/android/b64/riscv64",
"src/unix/linux_like/linux/gnu/b32/riscv32",
"src/unix/linux_like/linux/gnu/b64/riscv64",
"src/unix/linux_like/linux/musl/b32/riscv32",
"src/unix/linux_like/linux/musl/b64/riscv64",
"src/vxworks/riscv32.rs",
"src/vxworks/riscv64.rs",
]

[autolabel."O-solarish"]
trigger_files = ["src/unix/solarish"]

[autolabel."O-sparc"]
trigger_files = [
"src/unix/bsd/netbsdlike/netbsd/sparc64.rs",
"src/unix/bsd/netbsdlike/openbsd/sparc64.rs",
"src/unix/linux_like/linux/arch/sparc",
"src/unix/linux_like/linux/gnu/b32/sparc",
"src/unix/linux_like/linux/gnu/b64/sparc64",
]

[autolabel."O-unix"]
trigger_files = ["src/unix"]

[autolabel."O-wasi"]
trigger_files = ["src/wasi"]

[autolabel."O-wasm"]
trigger_files = ["src/"]

[autolabel."O-windows"]
trigger_files = ["src/windows"]

[autolabel."O-x86"]
trigger_files = [
"src/fuchsia/x86_64.rs",
"src/unix/bsd/apple/b64/x86_64",
"src/unix/bsd/freebsdlike/freebsd/freebsd12/x86_64.rs",
"src/unix/bsd/freebsdlike/freebsd/freebsd13/x86_64.rs",
"src/unix/bsd/freebsdlike/freebsd/freebsd14/x86_64.rs",
"src/unix/bsd/freebsdlike/freebsd/freebsd15/x86_64.rs",
"src/unix/bsd/freebsdlike/freebsd/x86.rs",
"src/unix/bsd/freebsdlike/freebsd/x86_64",
"src/unix/bsd/netbsdlike/netbsd/x86.rs",
"src/unix/bsd/netbsdlike/netbsd/x86_64.rs",
"src/unix/bsd/netbsdlike/openbsd/x86.rs",
"src/unix/bsd/netbsdlike/openbsd/x86_64.rs",
"src/unix/haiku/x86_64.rs",
"src/unix/linux_like/android/b32/x86",
"src/unix/linux_like/android/b64/x86_64",
"src/unix/linux_like/linux/gnu/b32/x86",
"src/unix/linux_like/linux/gnu/b64/x86_64",
"src/unix/linux_like/linux/musl/b32/x86",
"src/unix/linux_like/linux/musl/b64/x86_64",
"src/unix/linux_like/linux/uclibc/x86_64",
"src/unix/nto/x86_64.rs",
"src/unix/solarish/x86.rs",
"src/unix/solarish/x86_64.rs",
"src/unix/solarish/x86_common.rs",
"src/vxworks/x86.rs",
"src/vxworks/x86_64.rs",
]

[review-submitted]
# These labels are removed when a review is submitted.
review_labels = ["S-waiting-on-review"]
# This label is added when a review is submitted.
reviewed_label = "S-waiting-on-author"

[review-requested]
# Those labels are removed when PR author requests a review from an assignee
remove_labels = ["S-waiting-on-author"]
# Those labels are added when PR author requests a review from an assignee
add_labels = ["S-waiting-on-review"]

[shortcut]

[mentions."src/unix/bsd/netbsdlike/openbsd"]
message = "Some changes occurred in OpenBSD module"
cc = ["@semarie"]
Expand All @@ -29,5 +174,3 @@ cc = ["@semarie"]
[mentions."src/unix/solarish"]
message = "Some changes occurred in solarish module"
cc = ["@jclulow", "@pfmooney"]

[shortcut]

0 comments on commit 5ecb911

Please sign in to comment.