From 14299026385e2e7941cf25e1d921ff7e8a27fa3d Mon Sep 17 00:00:00 2001
From: Greg Fitzgerald <greg@solana.com>
Date: Mon, 18 Jun 2018 16:36:37 -0700
Subject: [PATCH] Generate coverage with Rust nightly

Fixes #177

Thanks @marco-c!
---
 README.md          |  2 +-
 ci/buildkite.yml   |  7 -------
 ci/coverage.sh     | 10 +++-------
 ci/test-nightly.sh |  1 +
 4 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index 8c0b10a4abfc35..5f0e74f3dcbffe 100644
--- a/README.md
+++ b/README.md
@@ -239,7 +239,7 @@ To generate code coverage statistics, run kcov via Docker:
 ```bash
 $ ./ci/coverage.sh
 ```
-The coverage report will be written to `./target/cov/index.html`
+The coverage report will be written to `./target/cov/report/index.html`
 
 
 Why coverage? While most see coverage as a code quality metric, we see it primarily as a developer
diff --git a/ci/buildkite.yml b/ci/buildkite.yml
index f12870e6f5ca77..3ff3049176f46c 100644
--- a/ci/buildkite.yml
+++ b/ci/buildkite.yml
@@ -3,13 +3,6 @@ steps:
     name: "stable [public]"
     timeout_in_minutes: 20
   - wait
-  - command: "ci/coverage.sh"
-    name: "coverage [public]"
-    timeout_in_minutes: 20
-    retry:
-      automatic:
-      - exit_status: "*"
-        limit: 2
   - command: "ci/docker-run.sh rustlang/rust:nightly ci/test-nightly.sh"
     name: "nightly [public]"
     timeout_in_minutes: 20
diff --git a/ci/coverage.sh b/ci/coverage.sh
index fc6098fc3b8fc3..89b4e5153878eb 100755
--- a/ci/coverage.sh
+++ b/ci/coverage.sh
@@ -2,15 +2,11 @@
 
 cd "$(dirname "$0")/.."
 
-ci/docker-run.sh evilmachines/rust-cargo-kcov \
-  bash -exc "\
-    export RUST_BACKTRACE=1; \
-    cargo build --verbose; \
-    cargo kcov --lib --verbose; \
-  "
+cargo install cargo-cov
+cargo cov test
 
 echo Coverage report:
-ls -l target/cov/index.html
+ls -l target/cov/report/index.html
 
 if [[ -z "$CODECOV_TOKEN" ]]; then
   echo CODECOV_TOKEN undefined
diff --git a/ci/test-nightly.sh b/ci/test-nightly.sh
index a0ae0102eeb131..a33ba3f770ac3f 100755
--- a/ci/test-nightly.sh
+++ b/ci/test-nightly.sh
@@ -10,5 +10,6 @@ rustup component add rustfmt-preview
 cargo build --verbose --features unstable
 cargo test --verbose --features unstable
 cargo bench --verbose --features unstable
+ci/coverage.sh
 
 exit 0