From a67ebc48ba71cda159369729643d6a3cf3c4e882 Mon Sep 17 00:00:00 2001
From: Greg Fitzgerald <greg@solana.com>
Date: Wed, 18 Jul 2018 12:11:05 -0400
Subject: [PATCH] Install llvm-cov on nightly to revive coverage

Towards #433
---
 ci/docker-rust-nightly/Dockerfile | 5 ++++-
 ci/test-nightly.sh                | 5 +----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ci/docker-rust-nightly/Dockerfile b/ci/docker-rust-nightly/Dockerfile
index 24047c6d8e62c7..74489838220cd6 100644
--- a/ci/docker-rust-nightly/Dockerfile
+++ b/ci/docker-rust-nightly/Dockerfile
@@ -1,3 +1,6 @@
 FROM rustlang/rust:nightly
 
-RUN cargo install --force clippy cargo-cov
+RUN cargo install --force clippy cargo-cov && \
+    echo deb http://ftp.debian.org/debian stretch-backports main >> /etc/apt/sources.list && \
+    apt update && \
+    apt install -y llvm-6.0
diff --git a/ci/test-nightly.sh b/ci/test-nightly.sh
index 49fb291583a492..0ba33f06e4a04f 100755
--- a/ci/test-nightly.sh
+++ b/ci/test-nightly.sh
@@ -15,9 +15,6 @@ _ cargo build --verbose --features unstable
 _ cargo test --verbose --features unstable
 _ cargo clippy -- --deny=warnings
 
-exit 0
-
-# Coverage disabled (see issue #433)
 _ cargo cov test
 _ cargo cov report
 
@@ -27,6 +24,6 @@ ls -l target/cov/report/index.html
 if [[ -z "$CODECOV_TOKEN" ]]; then
   echo CODECOV_TOKEN undefined
 else
-  bash <(curl -s https://codecov.io/bash) -x 'llvm-cov gcov'
+  bash <(curl -s https://codecov.io/bash) -x 'llvm-cov-6.0 gcov'
 fi