CI: Pull bitcoind test to separate script

Done in preparation for using the new maintainer tools script.

Pull the bitoind test out into a separate script because it is specific
to this repo.

No change in test coverage.

Author: tcharding

.github/workflows/rust.yml

@@ -47,9 +47,7 @@ jobs:
           toolchain: stable
           override: true
       - name: Running integration tests
-        env:
-          DO_BITCOIND_TESTS: true
-        run: ./contrib/test.sh
+        run: ./contrib/integration_test.sh
 
   Tests:
     name: Tests

contrib/integration_test.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+#
+# Run the integration test optionally downloading Bitcoin Core binary if BITCOINVERSION is set.
+
+set -euo pipefail
+
+REPO_DIR=$(git rev-parse --show-toplevel)
+
+# Make all cargo invocations verbose.
+export CARGO_TERM_VERBOSE=true
+
+BITCOIND_EXE="$REPO_DIR/bitcoind-tests/bin/bitcoind" cargo test --verbose

contrib/test.sh

@@ -27,16 +27,6 @@ then
     cargo fmt -- --check
 fi
 
-# Test bitcoind integration tests if told to (this only works with the stable toolchain)
-if [ "$DO_BITCOIND_TESTS" = true ]; then
-    cd bitcoind-tests
-    BITCOIND_EXE="$(git rev-parse --show-toplevel)/bitcoind-tests/bin/bitcoind" \
-    cargo test --verbose
-
-    # Exit integration tests, do not run other tests.
-    exit 0
-fi
-
 # Defaults / sanity checks
 cargo test