build: a few ugly hacks to get the rpc tests working out-of-tree
- Link pull-tester/rpc-tests.py to the build dir - Add the build-dir's config to the python path so that tests can find it - The tests themselves are in srcdir - Clean up __pycache__ in 'make clean'
This commit is contained in:
parent
fc4ad0c7fc
commit
ab95d5df3d
4 changed files with 5 additions and 1 deletions
|
@ -228,3 +228,4 @@ CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER)
|
||||||
|
|
||||||
clean-local:
|
clean-local:
|
||||||
rm -rf coverage_percent.txt test_bitcoin.coverage/ total.coverage/ qa/tmp/ cache/ $(OSX_APP)
|
rm -rf coverage_percent.txt test_bitcoin.coverage/ total.coverage/ qa/tmp/ cache/ $(OSX_APP)
|
||||||
|
rm -rf qa/pull-tester/__pycache__
|
||||||
|
|
|
@ -1060,6 +1060,7 @@ AC_SUBST(MINIUPNPC_LIBS)
|
||||||
AC_CONFIG_FILES([Makefile src/Makefile share/setup.nsi share/qt/Info.plist src/test/buildenv.py])
|
AC_CONFIG_FILES([Makefile src/Makefile share/setup.nsi share/qt/Info.plist src/test/buildenv.py])
|
||||||
AC_CONFIG_FILES([qa/pull-tester/run-bitcoind-for-test.sh],[chmod +x qa/pull-tester/run-bitcoind-for-test.sh])
|
AC_CONFIG_FILES([qa/pull-tester/run-bitcoind-for-test.sh],[chmod +x qa/pull-tester/run-bitcoind-for-test.sh])
|
||||||
AC_CONFIG_FILES([qa/pull-tester/tests_config.py],[chmod +x qa/pull-tester/tests_config.py])
|
AC_CONFIG_FILES([qa/pull-tester/tests_config.py],[chmod +x qa/pull-tester/tests_config.py])
|
||||||
|
AC_CONFIG_LINKS([qa/pull-tester/rpc-tests.py:qa/pull-tester/rpc-tests.py])
|
||||||
|
|
||||||
dnl boost's m4 checks do something really nasty: they export these vars. As a
|
dnl boost's m4 checks do something really nasty: they export these vars. As a
|
||||||
dnl result, they leak into secp256k1's configure and crazy things happen.
|
dnl result, they leak into secp256k1's configure and crazy things happen.
|
||||||
|
|
|
@ -29,6 +29,7 @@ import subprocess
|
||||||
import tempfile
|
import tempfile
|
||||||
import re
|
import re
|
||||||
|
|
||||||
|
sys.path.append("qa/pull-tester/")
|
||||||
from tests_config import *
|
from tests_config import *
|
||||||
|
|
||||||
BOLD = ("","")
|
BOLD = ("","")
|
||||||
|
@ -37,7 +38,7 @@ if os.name == 'posix':
|
||||||
# terminal via ANSI escape sequences:
|
# terminal via ANSI escape sequences:
|
||||||
BOLD = ('\033[0m', '\033[1m')
|
BOLD = ('\033[0m', '\033[1m')
|
||||||
|
|
||||||
RPC_TESTS_DIR = BUILDDIR + '/qa/rpc-tests/'
|
RPC_TESTS_DIR = SRCDIR + '/qa/rpc-tests/'
|
||||||
|
|
||||||
#If imported values are not defined then set to zero (or disabled)
|
#If imported values are not defined then set to zero (or disabled)
|
||||||
if 'ENABLE_WALLET' not in vars():
|
if 'ENABLE_WALLET' not in vars():
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
# Distributed under the MIT software license, see the accompanying
|
# Distributed under the MIT software license, see the accompanying
|
||||||
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||||
|
|
||||||
|
SRCDIR="@abs_top_srcdir@"
|
||||||
BUILDDIR="@abs_top_builddir@"
|
BUILDDIR="@abs_top_builddir@"
|
||||||
EXEEXT="@EXEEXT@"
|
EXEEXT="@EXEEXT@"
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue