Skip to content

Commit 773f837

Browse files
authored
Merge pull request #1673 from JohnTitor/remove-fixme
Remove some FIXME
2 parents 829e136 + 3c964a3 commit 773f837

File tree

2 files changed

+8
-22
lines changed

2 files changed

+8
-22
lines changed

ci/azure-master.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ pr: ["master"]
1212
jobs:
1313
- job: StyleAndDocs
1414
pool:
15-
vmImage: ubuntu-18.04
15+
# FIXME: It seems Ubuntu 18.04 doesn't work well with simpleinfra.
16+
vmImage: ubuntu-16.04
1617
steps:
1718
- template: azure-install-rust.yml
1819
- script: LIBC_CI=1 sh ci/dox.sh

ci/build.sh

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,6 @@ test_target() {
2424
TARGET="${2}"
2525
NO_STD="${3}"
2626

27-
opt=
28-
if [ "${TARGET}" = "x86_64-unknown-linux-gnux32" ]; then
29-
# FIXME: x86_64-unknown-linux-gnux32 fail to compile without
30-
# --release
31-
#
32-
# See https://github.com/rust-lang/rust/issues/45417
33-
opt="--release"
34-
fi
35-
# FIXME: https://github.com/rust-lang/rust/issues/61174
36-
if [ "${TARGET}" = "sparcv9-sun-solaris" ] ||
37-
[ "${TARGET}" = "x86_64-sun-solaris" ]; then
38-
return 0
39-
fi
40-
4127
# If there is a std component, fetch it:
4228
if [ "${NO_STD}" != "1" ]; then
4329
# FIXME: rustup often fails to download some artifacts due to network
@@ -55,28 +41,28 @@ test_target() {
5541
fi
5642

5743
# Test that libc builds without any default features (no libstd)
58-
cargo "+${RUST}" "${BUILD_CMD}" -vv $opt --no-default-features --target "${TARGET}"
44+
cargo "+${RUST}" "${BUILD_CMD}" -vv --no-default-features --target "${TARGET}"
5945

6046
# Test that libc builds with default features (e.g. libstd)
6147
# if the target supports libstd
6248
if [ "$NO_STD" != "1" ]; then
63-
cargo "+${RUST}" "${BUILD_CMD}" -vv $opt --target "${TARGET}"
49+
cargo "+${RUST}" "${BUILD_CMD}" -vv --target "${TARGET}"
6450
fi
6551

6652
# Test that libc builds with the `extra_traits` feature
67-
cargo "+${RUST}" "${BUILD_CMD}" -vv $opt --no-default-features --target "${TARGET}" \
53+
cargo "+${RUST}" "${BUILD_CMD}" -vv --no-default-features --target "${TARGET}" \
6854
--features extra_traits
6955

7056
# Test the 'const-extern-fn' feature on nightly
7157
if [ "${RUST}" = "nightly" ]; then
72-
cargo "+${RUST}" "${BUILD_CMD}" -vv $opt --no-default-features --target "${TARGET}" \
58+
cargo "+${RUST}" "${BUILD_CMD}" -vv --no-default-features --target "${TARGET}" \
7359
--features const-extern-fn
7460
fi
7561

7662

7763
# Also test that it builds with `extra_traits` and default features:
7864
if [ "$NO_STD" != "1" ]; then
79-
cargo "+${RUST}" "${BUILD_CMD}" -vv $opt --target "${TARGET}" \
65+
cargo "+${RUST}" "${BUILD_CMD}" -vv --target "${TARGET}" \
8066
--features extra_traits
8167
fi
8268
}
@@ -200,8 +186,6 @@ done
200186

201187
# FIXME: https://github.com/rust-lang/rust/issues/58564
202188
# sparc-unknown-linux-gnu
203-
# FIXME: https://github.com/rust-lang/rust/issues/62932
204-
# thumbv6m-none-eabi
205189
RUST_LINUX_NO_CORE_TARGETS="\
206190
aarch64-pc-windows-msvc \
207191
aarch64-unknown-cloudabi \
@@ -234,6 +218,7 @@ riscv32imac-unknown-none-elf \
234218
riscv32imc-unknown-none-elf \
235219
sparc64-unknown-netbsd \
236220
221+
thumbv6m-none-eabi \
237222
thumbv7em-none-eabi \
238223
thumbv7em-none-eabihf \
239224
thumbv7m-none-eabi \

0 commit comments

Comments
 (0)