Skip to content

Commit bb496cf

Browse files
JohnTitorJohnTitor
authored
Merge pull request #1672 from JohnTitor/ci-tweaks
CI tweaks
2 parents f9e7aac + 8d6d84b commit bb496cf

File tree

22 files changed

+76
-64
lines changed

22 files changed

+76
-64
lines changed

‎.cirrus.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
task:
22
name: nightly x86_64-unknown-freebsd-10
33
freebsd_instance:
4-
image: freebsd-10-4-release-amd64
4+
image: freebsd-10-4-release-amd64
55
setup_script:
66
- pkg install -y curl
77
- curl https://sh.rustup.rs -sSf --output rustup.sh
@@ -11,7 +11,7 @@ task:
1111
test_script:
1212
- . $HOME/.cargo/env
1313
- LIBC_CI=1 sh ci/run.sh x86_64-unknown-freebsd
14-
14+
1515
task:
1616
name: stable x86_64-unknown-freebsd-11
1717
freebsd_instance:
@@ -26,7 +26,7 @@ task:
2626
- . $HOME/.cargo/env
2727
- LIBC_CI=1 sh ci/run.sh x86_64-unknown-freebsd
2828
- sh ci/run.sh x86_64-unknown-freebsd
29-
29+
3030
task:
3131
name: nightly x86_64-unknown-freebsd-12
3232
freebsd_instance:

‎ci/azure-master.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pr: ["master"]
1212
jobs:
1313
- job: StyleAndDocs
1414
pool:
15-
vmImage: ubuntu-16.04
15+
vmImage: ubuntu-18.04
1616
steps:
1717
- template: azure-install-rust.yml
1818
- script: LIBC_CI=1 sh ci/dox.sh

‎ci/azure.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
arm-unknown-linux-musleabihf:
4848
TARGET: arm-unknown-linux-musleabihf
4949
# Disabled because currently broken, see:
50-
# https://github.com/rust-lang/libc/issues/1591
50+
# https://github.com/rust-lang/libc/issues/1591
5151
# asmjs-unknown-emscripten:
5252
# TARGET: asmjs-unknown-emscripten
5353
i686-linux-android:
@@ -77,7 +77,7 @@ jobs:
7777
sparc64-unknown-linux-gnu:
7878
TARGET: sparc64-unknown-linux-gnu
7979
# Disabled because currently broken, see:
80-
# https://github.com/rust-lang/libc/issues/1591
80+
# https://github.com/rust-lang/libc/issues/1591
8181
# wasm32-unknown-emscripten:
8282
# TARGET: wasm32-unknown-emscripten
8383
x86_64-linux-android:
@@ -89,7 +89,7 @@ jobs:
8989

9090
- job: DockerOSX64
9191
pool:
92-
vmImage: macos-10.14
92+
vmImage: macos-10.15
9393
steps:
9494
- template: azure-install-rust.yml
9595
- bash: LIBC_CI=1 sh ./ci/run.sh $TARGET
@@ -114,7 +114,7 @@ jobs:
114114
ARCH: x86_64
115115
x86_64-pc-windows-msvc:
116116
TARGET: x86_64-pc-windows-msvc
117-
# Disabled because broken:
117+
# Disabled because broken:
118118
# https://github.com/rust-lang/libc/issues/1592
119119
#i686-pc-windows-gnu:
120120
# TARGET: i686-pc-windows-gnu
@@ -125,7 +125,7 @@ jobs:
125125

126126
- job: StyleAndDocs
127127
pool:
128-
vmImage: ubuntu-16.04
128+
vmImage: ubuntu-18.04
129129
steps:
130130
- template: azure-install-rust.yml
131131
- script: sh ci/style.sh
@@ -141,7 +141,7 @@ jobs:
141141
# dependsOn: BuildChannelsLinux
142142
# continueOnError: true
143143
# pool:
144-
# vmImage: ubuntu-16.04
144+
# vmImage: ubuntu-18.04
145145
# steps:
146146
# - template: azure-install-rust.yml
147147
# - script: sh ci/semver.sh linux
@@ -151,7 +151,7 @@ jobs:
151151
# dependsOn: BuildChannelsOSX
152152
# continueOnError: true
153153
# pool:
154-
# vmImage: macos-10.14
154+
# vmImage: macos-10.15
155155
# steps:
156156
# - template: azure-install-rust.yml
157157
# - script: sh ci/semver.sh osx
@@ -160,7 +160,7 @@ jobs:
160160
- job: BuildChannelsLinux
161161
dependsOn: StyleAndDocs
162162
pool:
163-
vmImage: ubuntu-16.04
163+
vmImage: ubuntu-18.04
164164
steps:
165165
- template: azure-install-rust.yml
166166
- script: LIBC_CI=1 sh ./ci/build.sh
@@ -189,7 +189,7 @@ jobs:
189189
- job: BuildChannelsOSX
190190
dependsOn: StyleAndDocs
191191
pool:
192-
vmImage: macos-10.14
192+
vmImage: macos-10.15
193193
steps:
194194
- template: azure-install-rust.yml
195195
- script: LIBC_CI=1 sh ./ci/build.sh

‎ci/emscripten.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ exit 1
3030

3131
git clone https://github.com/emscripten-core/emsdk.git /emsdk-portable
3232
cd /emsdk-portable
33-
# TODO: switch to an upstream install once
33+
# FIXME: switch to an upstream install once
3434
# https://github.com/rust-lang/rust/pull/63649 lands
3535
hide_output ./emsdk install 1.38.42
3636
./emsdk activate 1.38.42

‎ci/run.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ if [ "$QEMU" != "" ]; then
3737
# plain qcow2 image: just download it
3838
qemufile="$(echo "${QEMU}" | sed 's/\//__/g')"
3939
if [ ! -f "${tmpdir}/${qemufile}" ]; then
40-
curl --retry 5 "${MIRRORS_URL}/${QEMU}" | \
40+
curl --retry 5 "${MIRRORS_URL}/${QEMU}" \
4141
> "${tmpdir}/${qemufile}"
4242
fi
4343
fi

‎libc-test/build.rs

+12
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,10 @@ fn test_apple(target: &str) {
182182
// These OSX constants are removed in Sierra.
183183
// https://developer.apple.com/library/content/releasenotes/General/APIDiffsMacOS10_12/Swift/Darwin.html
184184
"KERN_KDENABLE_BG_TRACE" | "KERN_KDDISABLE_BG_TRACE" => true,
185+
// FIXME: the value has been changed since Catalina (0xffff0000 -> 0x3fff0000).
186+
"SF_SETTABLE" => true,
187+
// FIXME: the value has been changed since Catalina (VM_FLAGS_RESILIENT_MEDIA is also contained now).
188+
"VM_FLAGS_USER_REMAP" => true,
185189
_ => false,
186190
}
187191
});
@@ -199,6 +203,14 @@ fn test_apple(target: &str) {
199203
}
200204
});
201205

206+
cfg.skip_field(move |struct_, field| {
207+
match (struct_, field) {
208+
// FIXME: the array size has been changed since macOS 10.15 ([8] -> [7]).
209+
("statfs", "f_reserved") => true,
210+
_ => false,
211+
}
212+
});
213+
202214
cfg.skip_field_type(move |struct_, field| {
203215
match (struct_, field) {
204216
// FIXME: actually a union

‎src/cloudabi/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ impl ::Clone for FILE {
120120
}
121121
}
122122
#[cfg_attr(feature = "extra_traits", derive(Debug))]
123-
pub enum fpos_t {} // TODO: fill this out with a struct
123+
pub enum fpos_t {} // FIXME: fill this out with a struct
124124
impl ::Copy for fpos_t {}
125125
impl ::Clone for fpos_t {
126126
fn clone(&self) -> fpos_t {

‎src/fuchsia/mod.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ impl ::Clone for DIR {
109109
}
110110

111111
#[cfg_attr(feature = "extra_traits", derive(Debug))]
112-
pub enum fpos64_t {} // TODO: fill this out with a struct
112+
pub enum fpos64_t {} // FIXME: fill this out with a struct
113113
impl ::Copy for fpos64_t {}
114114
impl ::Clone for fpos64_t {
115115
fn clone(&self) -> fpos64_t {
@@ -1416,7 +1416,7 @@ pub const F_SEAL_SHRINK: ::c_int = 0x0002;
14161416
pub const F_SEAL_GROW: ::c_int = 0x0004;
14171417
pub const F_SEAL_WRITE: ::c_int = 0x0008;
14181418

1419-
// TODO(#235): Include file sealing fcntls once we have a way to verify them.
1419+
// FIXME(#235): Include file sealing fcntls once we have a way to verify them.
14201420

14211421
pub const SIGTRAP: ::c_int = 5;
14221422

@@ -1433,7 +1433,7 @@ pub const CLOCK_MONOTONIC_COARSE: ::clockid_t = 6;
14331433
pub const CLOCK_BOOTTIME: ::clockid_t = 7;
14341434
pub const CLOCK_REALTIME_ALARM: ::clockid_t = 8;
14351435
pub const CLOCK_BOOTTIME_ALARM: ::clockid_t = 9;
1436-
// TODO(#247) Someday our Travis shall have glibc 2.21 (released in Sep
1436+
// FIXME(#247) Someday our Travis shall have glibc 2.21 (released in Sep
14371437
// 2014.) See also musl/mod.rs
14381438
// pub const CLOCK_SGI_CYCLE: ::clockid_t = 10;
14391439
// pub const CLOCK_TAI: ::clockid_t = 11;
@@ -2773,7 +2773,7 @@ pub const TIOCINQ: ::c_int = ::FIONREAD;
27732773
pub const RTLD_GLOBAL: ::c_int = 0x100;
27742774
pub const RTLD_NOLOAD: ::c_int = 0x4;
27752775

2776-
// TODO(#247) Temporarily musl-specific (available since musl 0.9.12 / Linux
2776+
// FIXME(#247) Temporarily musl-specific (available since musl 0.9.12 / Linux
27772777
// kernel 3.10). See also notbsd/mod.rs
27782778
pub const CLOCK_SGI_CYCLE: ::clockid_t = 10;
27792779
pub const CLOCK_TAI: ::clockid_t = 11;
@@ -3273,7 +3273,7 @@ impl ::Clone for FILE {
32733273
}
32743274
}
32753275
#[cfg_attr(feature = "extra_traits", derive(Debug))]
3276-
pub enum fpos_t {} // TODO: fill this out with a struct
3276+
pub enum fpos_t {} // FIXME: fill this out with a struct
32773277
impl ::Copy for fpos_t {}
32783278
impl ::Clone for fpos_t {
32793279
fn clone(&self) -> fpos_t {

‎src/unix/haiku/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -662,7 +662,7 @@ pub const LC_NUMERIC: ::c_int = 4;
662662
pub const LC_TIME: ::c_int = 5;
663663
pub const LC_MESSAGES: ::c_int = 6;
664664

665-
// TODO: Haiku does not have MAP_FILE, but libstd/os.rs requires it
665+
// FIXME: Haiku does not have MAP_FILE, but libstd/os.rs requires it
666666
pub const MAP_FILE: ::c_int = 0x00;
667667
pub const MAP_SHARED: ::c_int = 0x01;
668668
pub const MAP_PRIVATE: ::c_int = 0x02;
@@ -994,7 +994,7 @@ pub const PTHREAD_MUTEX_NORMAL: ::c_int = 1;
994994
pub const PTHREAD_MUTEX_ERRORCHECK: ::c_int = 2;
995995
pub const PTHREAD_MUTEX_RECURSIVE: ::c_int = 3;
996996

997-
pub const FIOCLEX: c_ulong = 0; // TODO: does not exist on Haiku!
997+
pub const FIOCLEX: c_ulong = 0; // FIXME: does not exist on Haiku!
998998

999999
pub const RUSAGE_CHILDREN: ::c_int = -1;
10001000

‎src/unix/linux_like/emscripten/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ pub type c_ulong = u32;
3535
pub type nlink_t = u32;
3636

3737
#[cfg_attr(feature = "extra_traits", derive(Debug))]
38-
pub enum fpos64_t {} // TODO: fill this out with a struct
38+
pub enum fpos64_t {} // FIXME: fill this out with a struct
3939
impl ::Copy for fpos64_t {}
4040
impl ::Clone for fpos64_t {
4141
fn clone(&self) -> fpos64_t {
@@ -1287,7 +1287,7 @@ pub const TIOCINQ: ::c_int = ::FIONREAD;
12871287
pub const RTLD_GLOBAL: ::c_int = 0x100;
12881288
pub const RTLD_NOLOAD: ::c_int = 0x4;
12891289

1290-
// TODO(#247) Temporarily musl-specific (available since musl 0.9.12 / Linux
1290+
// FIXME(#247) Temporarily musl-specific (available since musl 0.9.12 / Linux
12911291
// kernel 3.10). See also linux_like/mod.rs
12921292
pub const CLOCK_SGI_CYCLE: ::clockid_t = 10;
12931293
pub const CLOCK_TAI: ::clockid_t = 11;

‎src/unix/linux_like/linux/gnu/b64/aarch64/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -695,7 +695,7 @@ pub const HWCAP_SSBS: ::c_ulong = 1 << 28;
695695
pub const HWCAP_SB: ::c_ulong = 1 << 29;
696696
pub const HWCAP_PACA: ::c_ulong = 1 << 30;
697697
pub const HWCAP_PACG: ::c_ulong = 1 << 31;
698-
// TODO: enable these again once linux-api-headers are up to date enough on CI.
698+
// FIXME: enable these again once linux-api-headers are up to date enough on CI.
699699
// See discussion in https://github.com/rust-lang/libc/pull/1638
700700
//pub const HWCAP2_DCPODP: ::c_ulong = 1 << 0;
701701
//pub const HWCAP2_SVE2: ::c_ulong = 1 << 1;

‎src/unix/linux_like/linux/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ pub type Elf32_Section = u16;
3737
pub type Elf64_Section = u16;
3838

3939
#[cfg_attr(feature = "extra_traits", derive(Debug))]
40-
pub enum fpos64_t {} // TODO: fill this out with a struct
40+
pub enum fpos64_t {} // FIXME: fill this out with a struct
4141
impl ::Copy for fpos64_t {}
4242
impl ::Clone for fpos64_t {
4343
fn clone(&self) -> fpos64_t {

‎src/unix/linux_like/linux/musl/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ pub const TCSAFLUSH: ::c_int = 2;
328328
pub const RTLD_GLOBAL: ::c_int = 0x100;
329329
pub const RTLD_NOLOAD: ::c_int = 0x4;
330330

331-
// TODO(#247) Temporarily musl-specific (available since musl 0.9.12 / Linux
331+
// FIXME(#247) Temporarily musl-specific (available since musl 0.9.12 / Linux
332332
// kernel 3.10). See also linux_like/mod.rs
333333
pub const CLOCK_SGI_CYCLE: ::clockid_t = 10;
334334
pub const CLOCK_TAI: ::clockid_t = 11;

‎src/unix/linux_like/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ pub const F_SEAL_SHRINK: ::c_int = 0x0002;
482482
pub const F_SEAL_GROW: ::c_int = 0x0004;
483483
pub const F_SEAL_WRITE: ::c_int = 0x0008;
484484

485-
// TODO(#235): Include file sealing fcntls once we have a way to verify them.
485+
// FIXME(#235): Include file sealing fcntls once we have a way to verify them.
486486

487487
pub const SIGTRAP: ::c_int = 5;
488488

@@ -499,7 +499,7 @@ pub const CLOCK_MONOTONIC_COARSE: ::clockid_t = 6;
499499
pub const CLOCK_BOOTTIME: ::clockid_t = 7;
500500
pub const CLOCK_REALTIME_ALARM: ::clockid_t = 8;
501501
pub const CLOCK_BOOTTIME_ALARM: ::clockid_t = 9;
502-
// TODO(#247) Someday our Travis shall have glibc 2.21 (released in Sep
502+
// FIXME(#247) Someday our Travis shall have glibc 2.21 (released in Sep
503503
// 2014.) See also musl/mod.rs
504504
// pub const CLOCK_SGI_CYCLE: ::clockid_t = 10;
505505
// pub const CLOCK_TAI: ::clockid_t = 11;

‎src/unix/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ impl ::Clone for FILE {
365365
}
366366
}
367367
#[cfg_attr(feature = "extra_traits", derive(Debug))]
368-
pub enum fpos_t {} // TODO: fill this out with a struct
368+
pub enum fpos_t {} // FIXME: fill this out with a struct
369369
impl ::Copy for fpos_t {}
370370
impl ::Clone for fpos_t {
371371
fn clone(&self) -> fpos_t {

‎src/unix/redox/mod.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ pub const F_GETLK: ::c_int = 5;
258258
pub const F_SETLK: ::c_int = 6;
259259
pub const F_SETLKW: ::c_int = 7;
260260

261-
// TODO: relibc {
261+
// FIXME: relibc {
262262
pub const RTLD_DEFAULT: *mut ::c_void = 0i64 as *mut ::c_void;
263263
// }
264264

@@ -413,7 +413,7 @@ pub const F_GETFD: ::c_int = 1;
413413
pub const F_SETFD: ::c_int = 2;
414414
pub const F_GETFL: ::c_int = 3;
415415
pub const F_SETFL: ::c_int = 4;
416-
// TODO: relibc {
416+
// FIXME: relibc {
417417
pub const F_DUPFD_CLOEXEC: ::c_int = ::F_DUPFD;
418418
// }
419419
pub const FD_CLOEXEC: ::c_int = 0x0100_0000;
@@ -435,14 +435,14 @@ pub const O_DIRECTORY: ::c_int = 0x1000_0000;
435435
pub const O_PATH: ::c_int = 0x2000_0000;
436436
pub const O_SYMLINK: ::c_int = 0x4000_0000;
437437
// Negative to allow it to be used as int
438-
// TODO: Fix negative values missing from includes
438+
// FIXME: Fix negative values missing from includes
439439
pub const O_NOFOLLOW: ::c_int = -0x8000_0000;
440440

441441
// netdb.h
442442
pub const EAI_SYSTEM: ::c_int = -11;
443443

444444
// netinet/in.h
445-
// TODO: relibc {
445+
// FIXME: relibc {
446446
pub const IP_TTL: ::c_int = 2;
447447
pub const IPV6_UNICAST_HOPS: ::c_int = 16;
448448
pub const IPV6_MULTICAST_IF: ::c_int = 17;
@@ -460,7 +460,7 @@ pub const IP_DROP_MEMBERSHIP: ::c_int = 36;
460460

461461
// netinet/tcp.h
462462
pub const TCP_NODELAY: ::c_int = 1;
463-
// TODO: relibc {
463+
// FIXME: relibc {
464464
pub const TCP_KEEPIDLE: ::c_int = 1;
465465
// }
466466

@@ -575,7 +575,7 @@ pub const EXIT_SUCCESS: ::c_int = 0;
575575
pub const EXIT_FAILURE: ::c_int = 1;
576576

577577
// sys/ioctl.h
578-
// TODO: relibc {
578+
// FIXME: relibc {
579579
pub const FIONBIO: ::c_ulong = 0x5421;
580580
pub const FIOCLEX: ::c_ulong = 0x5451;
581581
// }

‎src/unix/uclibc/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ pub type nl_item = ::c_int;
2323
pub type idtype_t = ::c_uint;
2424

2525
#[cfg_attr(feature = "extra_traits", derive(Debug))]
26-
pub enum fpos64_t {} // TODO: fill this out with a struct
26+
pub enum fpos64_t {} // FIXME: fill this out with a struct
2727
impl ::Copy for fpos64_t {}
2828
impl ::Clone for fpos64_t {
2929
fn clone(&self) -> fpos64_t {
@@ -501,7 +501,7 @@ pub const F_GETLEASE: ::c_int = 1025;
501501
pub const F_NOTIFY: ::c_int = 1026;
502502
pub const F_DUPFD_CLOEXEC: ::c_int = 1030;
503503

504-
// TODO(#235): Include file sealing fcntls once we have a way to verify them.
504+
// FIXME(#235): Include file sealing fcntls once we have a way to verify them.
505505

506506
pub const SIGTRAP: ::c_int = 5;
507507

@@ -512,7 +512,7 @@ pub const CLOCK_REALTIME: ::clockid_t = 0;
512512
pub const CLOCK_MONOTONIC: ::clockid_t = 1;
513513
pub const CLOCK_PROCESS_CPUTIME_ID: ::clockid_t = 2;
514514
pub const CLOCK_THREAD_CPUTIME_ID: ::clockid_t = 3;
515-
// TODO(#247) Someday our Travis shall have glibc 2.21 (released in Sep
515+
// FIXME(#247) Someday our Travis shall have glibc 2.21 (released in Sep
516516
// 2014.) See also musl/mod.rs
517517
// pub const CLOCK_SGI_CYCLE: ::clockid_t = 10;
518518
// pub const CLOCK_TAI: ::clockid_t = 11;

0 commit comments

Comments
 (0)