summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Dashjr <luke-jr+git@utopios.org>2018-01-23 04:51:19 +0000
committerThomas Deutschmann <whissi@gentoo.org>2018-01-23 11:37:04 +0100
commitc8b2c0820cd84adac47e20c4eb4ce8440114e9ba (patch)
tree5b90405838f3de2fed2080a40e0082fe0fca8b59 /net-p2p/bitcoin-qt
parentnet-p2p/bitcoind-0.15.1: Fix tests (diff)
downloadgentoo-c8b2c0820cd84adac47e20c4eb4ce8440114e9ba.tar.gz
gentoo-c8b2c0820cd84adac47e20c4eb4ce8440114e9ba.tar.bz2
gentoo-c8b2c0820cd84adac47e20c4eb4ce8440114e9ba.zip
net-p2p/bitcoin-qt-0.15.1: Fix tests
Diffstat (limited to 'net-p2p/bitcoin-qt')
-rw-r--r--net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild4
-rw-r--r--net-p2p/bitcoin-qt/files/bitcoin-qt-0.15.1-test-build-fix.patch24
-rw-r--r--net-p2p/bitcoin-qt/files/bitcoin-qt-0.15.1-test-util-fix.patch15
3 files changed, 42 insertions, 1 deletions
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild
index 64339edd7ca2..75bc2d1f74f2 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2010-2017 Gentoo Foundation
+# Copyright 2010-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -124,11 +124,13 @@ src_prepare() {
sed -i 's/^\(complete -F _bitcoind \)bitcoind \(bitcoin-qt\)$/\1\2/' contrib/bitcoind.bash-completion || die
eapply "$(KNOTS_PATCH syslibs)"
+ eapply "${FILESDIR}/${PN}-0.15.1-test-util-fix.patch"
if use knots; then
eapply "$(KNOTS_PATCH f)"
eapply "$(KNOTS_PATCH branding)"
eapply "$(KNOTS_PATCH ts)"
+ eapply "${FILESDIR}/${PN}-0.15.1-test-build-fix.patch"
fi
eapply_user
diff --git a/net-p2p/bitcoin-qt/files/bitcoin-qt-0.15.1-test-build-fix.patch b/net-p2p/bitcoin-qt/files/bitcoin-qt-0.15.1-test-build-fix.patch
new file mode 100644
index 000000000000..3d953d9c0a94
--- /dev/null
+++ b/net-p2p/bitcoin-qt/files/bitcoin-qt-0.15.1-test-build-fix.patch
@@ -0,0 +1,24 @@
+commit 91976ef251bbb693db8c4e36b62ceca1f6417413 (HEAD)
+Author: Luke Dashjr <luke-jr+git@utopios.org>
+Date: Tue Jan 23 03:37:10 2018 +0000
+
+ Bugfix: script_tests: Only define debugger_cbs if HAVE_CONSENSUS_LIB
+
+diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
+index 7826cdc1b3..013846811b 100644
+--- a/src/test/script_tests.cpp
++++ b/src/test/script_tests.cpp
+@@ -186,11 +186,13 @@ static void script_tests_debugger_ScriptEOF(void *userdata, struct bitcoinconsen
+ ++data->eof;
+ }
+
++#if defined(HAVE_CONSENSUS_LIB)
+ static const struct bitcoinconsensus_script_debugger_callbacks debugger_cbs = {
+ .ScriptBegin = script_tests_debugger_ScriptBegin,
+ .ScriptPreStep = script_tests_debugger_ScriptPreStep,
+ .ScriptEOF = script_tests_debugger_ScriptEOF,
+ };
++#endif
+
+ void DoTest(const CScript& scriptPubKey, const CScript& scriptSig, const CScriptWitness& scriptWitness, int flags, const std::string& message, int scriptError, CAmount nValue = 0)
+ {
diff --git a/net-p2p/bitcoin-qt/files/bitcoin-qt-0.15.1-test-util-fix.patch b/net-p2p/bitcoin-qt/files/bitcoin-qt-0.15.1-test-util-fix.patch
new file mode 100644
index 000000000000..60fc9d849054
--- /dev/null
+++ b/net-p2p/bitcoin-qt/files/bitcoin-qt-0.15.1-test-util-fix.patch
@@ -0,0 +1,15 @@
+diff --git a/src/Makefile.test.include b/src/Makefile.test.include
+index 147add3eb5..308b1c88c0 100644
+--- a/src/Makefile.test.include
++++ b/src/Makefile.test.include
+@@ -151,8 +151,10 @@ bitcoin_test_clean : FORCE
+ rm -f $(CLEAN_BITCOIN_TEST) $(test_test_bitcoin_OBJECTS) $(TEST_BINARY)
+
+ check-local:
++if BUILD_BITCOIN_TX
+ @echo "Running test/util/bitcoin-util-test.py..."
+ $(PYTHON) $(top_builddir)/test/util/bitcoin-util-test.py
++endif
+ if EMBEDDED_LIBSECP256K1
+ $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check
+ endif