From 4b15c59b77c4d5e0d6a09200131c55efdfbb2ffa Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jonathan@jlebon.com>
Date: Fri, 21 Feb 2020 22:38:54 -0500
Subject: [PATCH] ci: Move `cargo test` into `ci/msrv.sh`

We need `cargo` in our `PATH` and we already do the `PATH=...` dance in
`ci/msrv.sh`. This only worked before because we were inadvertedly
re-installing cargo when calling `ci/build.sh`, which was fixed in the
previous commit.
---
 .cci.jenkinsfile | 1 -
 ci/msrv.sh       | 7 ++++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.cci.jenkinsfile b/.cci.jenkinsfile
index 404d76c4..a6c980cb 100644
--- a/.cci.jenkinsfile
+++ b/.cci.jenkinsfile
@@ -51,7 +51,6 @@ rust: {
       sh """
         set -xeuo pipefail
         ci/msrv.sh
-        cd rust && cargo test
       """
   }
 }}
diff --git a/ci/msrv.sh b/ci/msrv.sh
index b1efa464..1cf6683d 100755
--- a/ci/msrv.sh
+++ b/ci/msrv.sh
@@ -7,7 +7,12 @@ MINIMUM_SUPPORTED_RUST_VERSION=1.39.0
 ci/installdeps.sh
 dnf remove -y cargo
 curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain ${MINIMUM_SUPPORTED_RUST_VERSION} -y
-PATH="$HOME/.cargo/bin:$PATH" SKIP_INSTALLDEPS=1 ci/build.sh |& tee out.txt
+export PATH="$HOME/.cargo/bin:$PATH"
+SKIP_INSTALLDEPS=1 ci/build.sh |& tee out.txt
 grep ${MINIMUM_SUPPORTED_RUST_VERSION} out.txt
 grep "checking for cargo... $HOME/.cargo/bin/cargo" out.txt
 grep "checking for rustc... $HOME/.cargo/bin/rustc" out.txt
+
+# and run the tests
+cd rust
+cargo test