From a831678065161748c837b4a784c85a952e71be9f Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Thu, 2 May 2019 11:47:46 -0700
Subject: [PATCH] More azure config fixes

---
 README.md           | 2 ++
 azure-pipelines.yml | 9 +++++++++
 ci/run-docker.sh    | 3 ++-
 ci/run.sh           | 6 +++---
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 24b816c..568a049 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # `libm`
 
+[![Build Status](https://dev.azure.com/rust-lang/libm/_apis/build/status/rust-lang-nursery.libm?branchName=master)](https://dev.azure.com/rust-lang/libm/_build/latest?definitionId=7&branchName=master)
+
 A port of [MUSL]'s libm to Rust.
 
 [MUSL]: https://www.musl-libc.org/
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 9f4e367..d8068e0 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -8,7 +8,11 @@ jobs:
     steps:
       - template: ci/azure-install-rust.yml
       - bash: rustup target add $TARGET
+        displayName: "add cross target"
+      - bash: rustup target add x86_64-unknown-linux-musl
+        displayName: "add musl target"
       - bash: cargo generate-lockfile && ./ci/run-docker.sh $TARGET
+        displayName: "run tests"
     strategy:
       matrix:
         aarch64:
@@ -47,6 +51,8 @@ jobs:
         displayName: "Build for wasm"
       - script: cargo build --target wasm32-unknown-unknown --no-default-features
         displayName: "Build for wasm (no default features)"
+    variables:
+      TOOLCHAIN: nightly
 
   - job: rustfmt
     pool:
@@ -54,7 +60,9 @@ jobs:
     steps:
       - template: ci/azure-install-rust.yml
       - bash: rustup component add rustfmt
+        displayName: "install rustfmt"
       - bash: cargo fmt --all -- --check
+        displayName: "check formatting"
 
   - job: compiler_builtins_works
     pool:
@@ -62,3 +70,4 @@ jobs:
     steps:
       - template: ci/azure-install-rust.yml
       - bash: cargo build -p cb
+        displayName: "Check compiler-builtins still probably builds"
diff --git a/ci/run-docker.sh b/ci/run-docker.sh
index 6b3066e..95bd3db 100755
--- a/ci/run-docker.sh
+++ b/ci/run-docker.sh
@@ -22,9 +22,10 @@ run() {
            -v `pwd`/target:/target \
            -v `pwd`:/checkout:ro \
            -v `rustc --print sysroot`:/rust:ro \
+           --init \
            -w /checkout \
            $target \
-           sh -c "HOME=/tmp PATH=\$PATH:/rust/bin ci/run.sh $target"
+           sh -c "HOME=/tmp PATH=\$PATH:/rust/bin exec ci/run.sh $target"
 }
 
 if [ -z "$1" ]; then
diff --git a/ci/run.sh b/ci/run.sh
index fabfd0e..d288113 100755
--- a/ci/run.sh
+++ b/ci/run.sh
@@ -3,10 +3,10 @@
 set -ex
 TARGET=$1
 
-cargo build --target $TARGET
 cargo test --target $TARGET
-cargo build --target $TARGET --release
 cargo test --target $TARGET --release
 
-cargo test --features 'checked musl-reference-tests' --target $TARGET
+# FIXME(#4) overflow checks in non-release currently cause issues
+#cargo test --features 'checked musl-reference-tests' --target $TARGET
+
 cargo test --features 'checked musl-reference-tests' --target $TARGET --release