BTCPrivate
/
BTCP-Rebase
mirror of https://github.com/BTCPrivate/BTCP-Rebase.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge #11433: qa: Restore bitcoin-util-test py2 compatibility 

fafff1220 qa: Restore bitcoin-util-test py2 compatibility (MarcoFalke)

Pull request description:

  Currently `./configure && make check` will look for python3, then python2. As long as we support python2 (and use it as fallback), `make check` should run fine with both python2 and python3.

  Fixes #11352 by @Zenitur

Tree-SHA512: a335ebdd224328d6f924fe52a9b97de196926476c9ee04ce3280743ea93bcae355eb2d5d4bed4050c01b2e904105595eac7db2eaa9307207581caa0a98ebcc0b
This commit is contained in:
MarcoFalke 2017-10-03 21:24:53 +02:00
parent dbc4ae0396 fafff1220c
commit b4a509a3f8
No known key found for this signature in database
GPG Key ID: D2EA4850E7528B25
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile.test.include
View File

@ -149,7 +149,7 @@ bitcoin_test_clean : FORCE
check-local: check-local:
@echo "Running test/util/bitcoin-util-test.py..." @echo "Running test/util/bitcoin-util-test.py..."
$(top_builddir)/test/util/bitcoin-util-test.py $(PYTHON) $(top_builddir)/test/util/bitcoin-util-test.py
$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check
if EMBEDDED_UNIVALUE if EMBEDDED_UNIVALUE
$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C univalue check $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C univalue check

13
test/util/bitcoin-util-test.py
View File

@ -9,9 +9,14 @@ Runs automatically during `make check`.
Can also be run manually.""" Can also be run manually."""
from __future__ import division,print_function,unicode_literals
import argparse import argparse
import binascii import binascii
import configparser try:
import configparser
except ImportError:
import ConfigParser as configparser
import difflib import difflib
import json import json
import logging import logging
@ -22,7 +27,9 @@ import sys
def main(): def main():
config = configparser.ConfigParser() config = configparser.ConfigParser()
config.read_file(open(os.path.dirname(__file__) + "/../config.ini")) config.optionxform = str
config.readfp(open(os.path.join(os.path.dirname(__file__), "../config.ini")))
env_conf = dict(config.items('environment'))
parser = argparse.ArgumentParser(description=__doc__) parser = argparse.ArgumentParser(description=__doc__)
parser.add_argument('-v', '--verbose', action='store_true') parser.add_argument('-v', '--verbose', action='store_true')
@ -37,7 +44,7 @@ def main():
# Add the format/level to the logger # Add the format/level to the logger
logging.basicConfig(format=formatter, level=level) logging.basicConfig(format=formatter, level=level)
bctester(config["environment"]["SRCDIR"] + "/test/util/data", "bitcoin-util-test.json", config["environment"]) bctester(os.path.join(env_conf["SRCDIR"], "test/util/data"), "bitcoin-util-test.json", env_conf)
def bctester(testDir, input_basename, buildenv): def bctester(testDir, input_basename, buildenv):
""" Loads and parses the input file, runs all tests and reports results""" """ Loads and parses the input file, runs all tests and reports results"""