diff --git a/.cirrus.yml b/.cirrus.yml index 448721962855619350f470d9b4a85762fd6ecf82..faef69c2ab1c8edf2a886da0ab48afaa1c5d6601 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -1,40 +1,41 @@ task: - name: nightly x86_64-unknown-freebsd-10 + name: stable x86_64-unknown-freebsd-11 freebsd_instance: - image: freebsd-10-4-release-amd64 + image: freebsd-11-4-release-amd64 setup_script: - pkg install -y curl - curl https://sh.rustup.rs -sSf --output rustup.sh - - sh rustup.sh --default-toolchain nightly -y --profile=minimal + - sh rustup.sh -y --profile=minimal - . $HOME/.cargo/env - - rustup default nightly + - rustup default stable test_script: - . $HOME/.cargo/env - LIBC_CI=1 sh ci/run.sh x86_64-unknown-freebsd + - sh ci/run.sh x86_64-unknown-freebsd task: - name: stable x86_64-unknown-freebsd-11 + name: nightly x86_64-unknown-freebsd-12 freebsd_instance: - image: freebsd-11-4-release-amd64 + image: freebsd-12-1-release-amd64 setup_script: - pkg install -y curl - curl https://sh.rustup.rs -sSf --output rustup.sh - - sh rustup.sh -y --profile=minimal + - sh rustup.sh --default-toolchain nightly -y --profile=minimal - . $HOME/.cargo/env - - rustup default stable + - rustup default nightly test_script: - . $HOME/.cargo/env - LIBC_CI=1 sh ci/run.sh x86_64-unknown-freebsd - sh ci/run.sh x86_64-unknown-freebsd task: - name: nightly x86_64-unknown-freebsd-12 + name: nightly x86_64-unknown-freebsd-13 freebsd_instance: - image: freebsd-12-1-release-amd64 + image: freebsd-13-0-current-amd64-v20201001 setup_script: - pkg install -y curl - curl https://sh.rustup.rs -sSf --output rustup.sh - - sh rustup.sh --default-toolchain nightly -y --profile=minimal + - sh rustup.sh -y --profile=minimal - . $HOME/.cargo/env - rustup default nightly test_script: diff --git a/ci/run.sh b/ci/run.sh index 6fb059d2eae58c09f4f57aeefcd27b3496b5e584..cbf644e4481a1003a5a2d25ede6c2d581c975694 100755 --- a/ci/run.sh +++ b/ci/run.sh @@ -121,6 +121,10 @@ else cargo test $opt --manifest-path libc-test/Cargo.toml --target "${TARGET}" + # FIXME: Somehow it now emits errors like: + # `relocation truncated to fit: R_MIPS_GOT_DISP against `fchmod@@GLIBC_2.0'` + if [ "$TARGET" != "mips64el-unknown-linux-gnuabi64" ] && [ "$TARGET" != "mips64-unknown-linux-gnuabi64" ]; then cargo test $opt --features extra_traits --manifest-path libc-test/Cargo.toml \ --target "${TARGET}" + fi fi diff --git a/libc-test/build.rs b/libc-test/build.rs index b9120809b8ae324b867e5917862c33e55294100d..65b049a9cce75e03a72011562ef43be14c5ef001 100755 --- a/libc-test/build.rs +++ b/libc-test/build.rs @@ -1843,6 +1843,11 @@ fn test_freebsd(target: &str) { // This was renamed in FreeBSD 12.2 and 13 (r350749). "IPPROTO_SEP" | "IPPROTO_DCCP" => true, + // This was changed to 96(0x60) in FreeBSD 13: + // https://github.com/freebsd/freebsd/ + // commit/06b00ceaa914a3907e4e27bad924f44612bae1d7 + "MINCORE_SUPER" if Some(13) == freebsd_ver => true, + _ => false, } });