diff --git a/src/Makefile.test.include b/src/Makefile.test.include
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@@ -3,8 +3,6 @@
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
TESTS += test/test_bitcoin
-LOG_DRIVER = $(srcdir)/test/test-bitcoin-driver
-EXTRA_DIST += test/test-bitcoin-driver
bin_PROGRAMS += test/test_bitcoin
noinst_PROGRAMS += test/test_bitcoin_fuzzy
TEST_SRCDIR = test
diff --git a/src/test/test-bitcoin-driver b/src/test/test-bitcoin-driver
deleted file mode 100755
--- a/src/test/test-bitcoin-driver
+++ /dev/null
@@ -1,175 +0,0 @@
-#! /bin/sh
-# test-driver - basic testsuite driver script.
-
-scriptversion=2013-07-13.22; # UTC
-
-# Copyright (C) 2011-2014 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see .
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to or send patches to
-# .
-
-# Make unconditional expansion of undefined variables an error. This
-# helps a lot in preventing typo-related bugs.
-set -u
-
-usage_error ()
-{
- echo "$0: $*" >&2
- print_usage >&2
- exit 2
-}
-
-print_usage ()
-{
- cat <&1
-else
- "$@" >$log_file 2>&1
-fi
-estatus=$?
-# got back to undefined is bad mode....
-set -u
-
-
-
-if test $enable_hard_errors = no && test $estatus -eq 99; then
- tweaked_estatus=1
-else
- tweaked_estatus=$estatus
-fi
-
-case $tweaked_estatus:$expect_failure in
- 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;;
- 0:*) col=$grn res=PASS recheck=no gcopy=no;;
- 77:*) col=$blu res=SKIP recheck=no gcopy=yes;;
- 99:*) col=$mgn res=ERROR recheck=yes gcopy=yes;;
- *:yes) col=$lgn res=XFAIL recheck=no gcopy=yes;;
- *:*) col=$red res=FAIL recheck=yes gcopy=yes;;
-esac
-
-# Report the test outcome and exit status in the logs, so that one can
-# know whether the test passed or failed simply by looking at the '.log'
-# file, without the need of also peaking into the corresponding '.trs'
-# file (automake bug#11814).
-echo "$res $test_name (exit status: $estatus)" >>$log_file
-
-# Report outcome to console.
-echo "${col}${res}${std}: $test_name"
-
-# Register the test result, and other relevant metadata.
-echo ":test-result: $res" > $trs_file
-echo ":global-test-result: $res" >> $trs_file
-echo ":recheck: $recheck" >> $trs_file
-echo ":copy-in-global-log: $gcopy" >> $trs_file
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
-# End:
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -27,14 +27,7 @@
#include
#include
-#include
-#include
-#include
-#include
-#include
-#include
#include
-#include
void CConnmanTest::AddNode(CNode &node) {
LOCK(g_connman->cs_vNodes);
@@ -223,70 +216,3 @@
spendsCoinbase, sigOpCost, lp);
}
-namespace {
-// A place to put misc. setup code eg "the travis workaround" that needs to run
-// at program startup and exit
-struct Init {
- Init();
- ~Init();
-
- std::list> cleanup;
-};
-
-Init init;
-
-Init::Init() {
- if (getenv("TRAVIS_NOHANG_WORKAROUND")) {
- // This is a workaround for MinGW/Win32 builds on Travis sometimes
- // hanging due to no output received by Travis after a 10-minute
- // timeout.
- // The strategy here is to let the jobs finish however long they take
- // on Travis, by feeding Travis output. We start a parallel thread
- // that just prints out '.' once per second.
- struct Private {
- Private() : stop(false) {}
- std::atomic_bool stop;
- std::thread thr;
- std::condition_variable cond;
- std::mutex mut;
- } *p = new Private;
-
- p->thr = std::thread([p] {
- // thread func.. print dots
- std::unique_lock lock(p->mut);
- unsigned ctr = 0;
- while (!p->stop) {
- if (ctr) {
- // skip first period to allow app to print first
- std::cerr << "." << std::flush;
- }
- if (!(++ctr % 79)) {
- // newline once in a while to keep travis happy
- std::cerr << std::endl;
- }
- p->cond.wait_for(lock, std::chrono::milliseconds(1000));
- }
- });
-
- cleanup.emplace_back([p]() {
- // cleanup function to kill the thread and delete the struct
- p->mut.lock();
- p->stop = true;
- p->cond.notify_all();
- p->mut.unlock();
- if (p->thr.joinable()) {
- p->thr.join();
- }
- delete p;
- });
- }
-}
-
-Init::~Init() {
- for (auto &f : cleanup) {
- if (f) {
- f();
- }
- }
-}
-} // end anonymous namespace