aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCory Fields <cory-nospam-@coryfields.com>2016-06-01 18:47:21 -0400
committerCory Fields <cory-nospam-@coryfields.com>2016-06-01 20:31:55 -0400
commitab95d5df3dc492c6355c78686c559527622fe033 (patch)
tree4c7e64d92d4081125852edaa75cf779408bf6c98
parentfc4ad0c7fcf2e5841756c9d1003f95c879ee5cd2 (diff)
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'
-rw-r--r--Makefile.am1
-rw-r--r--configure.ac1
-rwxr-xr-xqa/pull-tester/rpc-tests.py3
-rw-r--r--qa/pull-tester/tests_config.py.in1
4 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index bfdf76568a..9957968f81 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -228,3 +228,4 @@ CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER)
clean-local:
rm -rf coverage_percent.txt test_bitcoin.coverage/ total.coverage/ qa/tmp/ cache/ $(OSX_APP)
+ rm -rf qa/pull-tester/__pycache__
diff --git a/configure.ac b/configure.ac
index a1c04daf53..7f9ff20cd7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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([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_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 result, they leak into secp256k1's configure and crazy things happen.
diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py
index f810f89a59..57a576f1c7 100755
--- a/qa/pull-tester/rpc-tests.py
+++ b/qa/pull-tester/rpc-tests.py
@@ -29,6 +29,7 @@ import subprocess
import tempfile
import re
+sys.path.append("qa/pull-tester/")
from tests_config import *
BOLD = ("","")
@@ -37,7 +38,7 @@ if os.name == 'posix':
# terminal via ANSI escape sequences:
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 'ENABLE_WALLET' not in vars():
diff --git a/qa/pull-tester/tests_config.py.in b/qa/pull-tester/tests_config.py.in
index 2356b5200e..a0d0a3d98a 100644
--- a/qa/pull-tester/tests_config.py.in
+++ b/qa/pull-tester/tests_config.py.in
@@ -3,6 +3,7 @@
# Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+SRCDIR="@abs_top_srcdir@"
BUILDDIR="@abs_top_builddir@"
EXEEXT="@EXEEXT@"