Merge rust-bitcoin/rust-bitcoin#1238: CI clean ups

37cd6503f1 ci: Remove TOOLCHAIN env var (Tobin C. Harding)
8eb6c23eaf ci: Remove inner quotes from shell variable (Tobin C. Harding)
58ede47ef1 ci: Use set -ex instead of /bin/sh -ex (Tobin C. Harding)
4c4846f82a Remove double blank line at EOF (Tobin C. Harding)

Pull request description:

  Clean up the CI script. These patches are part of #1225, are beneficial to have before that PR resolves, and are trivial.

ACKs for top commit:
  sanket1729:
    utACK 37cd6503f1
  apoelstra:
    ACK 37cd6503f1

Tree-SHA512: f6b3379c8a1be7a3519461faeed35e35560e4228bddb59ef28ab3fb3ef2679afabfaccfeaffd78adbb66879aed02c092f3d9d1d1eb3193c811067ee75e876732

contrib/test.sh

@@ -1,13 +1,9 @@
-#!/bin/sh -ex
+#!/bin/sh
+
+set -ex
 
 FEATURES="base64 bitcoinconsensus serde rand secp-recovery"
 
-# Use toolchain if explicitly specified
-if [ -n "$TOOLCHAIN" ]
-then
-    alias cargo="cargo +$TOOLCHAIN"
-fi
-
 if [ "$DO_COV" = true ]
 then
     export RUSTFLAGS="-C link-dead-code"
@@ -78,7 +74,7 @@ fi
 # Test each feature
 for feature in ${FEATURES}
 do
-    echo "********* Testing "$feature" *************"
+    echo "********* Testing $feature *************"
     cargo test --verbose --features="$feature"
 done
 
@@ -102,11 +98,11 @@ fi
 # Bench if told to, only works with non-stable toolchain (nightly, beta).
 if [ "$DO_BENCH" = true ]
 then
-    if [ "NIGHTLY" = false ]
+    if [ "$NIGHTLY" = false ]
     then
-        if [ -n "TOOLCHAIN" ]
+        if [ -n "$RUSTUP_TOOLCHAIN" ]
         then
-            echo "TOOLCHAIN is set to a non-nightly toolchain but DO_BENCH requires a nightly toolchain"
+            echo "RUSTUP_TOOLCHAIN is set to a non-nightly toolchain but DO_BENCH requires a nightly toolchain"
         else
             echo "DO_BENCH requires a nightly toolchain"
         fi

src/blockdata/constants.rs

@@ -305,4 +305,3 @@ mod test {
         assert_eq!(got, want);
     }
 }
-

src/blockdata/mod.rs

@@ -14,4 +14,3 @@ pub mod script;
 pub mod transaction;
 pub mod block;
 pub mod witness;
-

src/blockdata/script.rs

@@ -1538,4 +1538,3 @@ mod test {
         assert!(read_scriptbool(&v));
     }
 }
-

src/consensus/encode.rs

@@ -1170,4 +1170,3 @@ mod tests {
         }
     }
 }
-

src/network/message_blockdata.rs

@@ -179,4 +179,3 @@ mod tests {
         assert_eq!(serialize(&real_decode), from_sat);
     }
 }
-

src/util/amount.rs

@@ -2238,4 +2238,3 @@ mod tests {
         }
     }
 }
-

src/util/base58.rs

@@ -334,4 +334,3 @@ mod tests {
 
     }
 }
-

src/util/bip32.rs

@@ -1177,4 +1177,3 @@ mod tests {
         ExtendedPrivKey::from_str(xpriv_str).unwrap();
     }
 }
-