gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

net-p2p/bitcoind-0.15.1: Fix tests

Browse Source 
Closes: https://github.com/gentoo/gentoo/pull/6934
Closes: https://bugs.gentoo.org/645250
This commit is contained in:
Luke Dashjr
2018-01-23 04:03:32 +00:00
committed by Thomas Deutschmann
parent f0d819c621
commit 4909efc243
3 changed files with 42 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net-p2p/bitcoind/bitcoind-0.15.1.ebuild
View File

@@ -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
@@ -74,11 +74,13 @@ src_prepare() {
sed -i 's/^\(complete -F _bitcoind bitcoind\) bitcoin-qt$/\1/' contrib/${PN}.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

24
net-p2p/bitcoind/files/bitcoind-0.15.1-test-build-fix.patch Normal file
View File

@@ -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)
{

15
net-p2p/bitcoind/files/bitcoind-0.15.1-test-util-fix.patch Normal file
View File

@@ -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