From 45adbf88dd16fdaa2d74ddc36db3ea06785ac6a5 Mon Sep 17 00:00:00 2001 From: gnzlbg Date: Mon, 21 Jan 2019 19:54:17 +0100 Subject: [PATCH 1/4] Re-enables android build jobs Closes #1170 . --- .travis.yml | 4 ---- ci/android-install-sdk.sh | 6 +++--- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index da882aea61b9d..6116475d2e2e7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -88,10 +88,6 @@ matrix: - shellcheck --version - shellcheck ci/*.sh - allow_failures: - - env: TARGET=aarch64-linux-android - - env: TARGET=x86_64-linux-android - install: rustup target add $TARGET script: - cargo generate-lockfile --manifest-path libc-test/Cargo.toml diff --git a/ci/android-install-sdk.sh b/ci/android-install-sdk.sh index c0f63c9baa0f8..6b5ac09ab04af 100644 --- a/ci/android-install-sdk.sh +++ b/ci/android-install-sdk.sh @@ -46,9 +46,9 @@ case "$1" in esac; # --no_https avoids -# javax.net.ssl.SSLHandshakeException: sun.security.validator.ValidatorException: No trusted certificate found -echo "yes" | \ - ./sdk/tools/bin/sdkmanager --no_https \ + # javax.net.ssl.SSLHandshakeException: sun.security.validator.ValidatorException: No trusted certificate found +yes | ./sdk/tools/bin/sdkmanager --licenses --no_https +yes | ./sdk/tools/bin/sdkmanager --no_https \ "emulator" \ "platform-tools" \ "platforms;android-24" \ From 5a7b4e7796859396d77afb348de3d68a3ecb1b52 Mon Sep 17 00:00:00 2001 From: gnzlbg Date: Mon, 21 Jan 2019 20:34:17 +0100 Subject: [PATCH 2/4] MFD_HUGETLB does not appear to be available on x86_64-android --- libc-test/build.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libc-test/build.rs b/libc-test/build.rs index 7606800afb9cd..5edbdf5b73893 100644 --- a/libc-test/build.rs +++ b/libc-test/build.rs @@ -658,7 +658,7 @@ fn main() { // MFD_HUGETLB is not available in some older libc versions on the CI builders. On the // x86_64 and i686 builders it seems to be available for all targets, so at least test // it there. - "MFD_HUGETLB" if !(x86_64 || i686) || musl => true, + "MFD_HUGETLB" if !(x86_64 || i686) || musl || (x86_64 && android)=> true, "DT_FIFO" | "DT_CHR" | "DT_DIR" | "DT_BLK" | "DT_REG" | "DT_LNK" | "DT_SOCK" From b71ea8ba24b9553e01cb673330fcb942f0c84f6d Mon Sep 17 00:00:00 2001 From: gnzlbg Date: Mon, 21 Jan 2019 21:23:44 +0100 Subject: [PATCH 3/4] Allow emscripten asmjs and wasm32 targets to fail --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index 6116475d2e2e7..203a8a68e2abd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -88,6 +88,11 @@ matrix: - shellcheck --version - shellcheck ci/*.sh + allow_failures: + # FIXME: https://github.com/rust-lang/libc/issues/1226 + - env: TARGET=asmjs-unknown-emscripten + - env: TARGET=wasm32-unknown-emscripten + install: rustup target add $TARGET script: - cargo generate-lockfile --manifest-path libc-test/Cargo.toml From 4f9cc1a2086ce46cb6a712c68c0e752d2b85b040 Mon Sep 17 00:00:00 2001 From: gnzlbg Date: Mon, 21 Jan 2019 22:04:14 +0100 Subject: [PATCH 4/4] Fix indentation of allow_failures --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 203a8a68e2abd..52d2403cd5963 100644 --- a/.travis.yml +++ b/.travis.yml @@ -88,7 +88,7 @@ matrix: - shellcheck --version - shellcheck ci/*.sh - allow_failures: + allow_failures: # FIXME: https://github.com/rust-lang/libc/issues/1226 - env: TARGET=asmjs-unknown-emscripten - env: TARGET=wasm32-unknown-emscripten