From fae2673d5d8dbb356423aa584a96d3ac367b5716 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Sun, 1 Oct 2017 16:42:39 +0200 Subject: [PATCH 1/2] qa: check-rpc-mapping must not run on empty lists --- contrib/devtools/check-rpc-mappings.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/devtools/check-rpc-mappings.py b/contrib/devtools/check-rpc-mappings.py index d2698de041..7e96852c5c 100755 --- a/contrib/devtools/check-rpc-mappings.py +++ b/contrib/devtools/check-rpc-mappings.py @@ -63,7 +63,7 @@ def process_commands(fname): else: args = [] cmds.append(RPCCommand(name, args)) - assert not in_rpcs, "Something went wrong with parsing the C++ file: update the regexps" + assert not in_rpcs and cmds, "Something went wrong with parsing the C++ file: update the regexps" return cmds def process_mapping(fname): @@ -86,7 +86,7 @@ def process_mapping(fname): idx = int(m.group(2)) argname = parse_string(m.group(3)) cmds.append((name, idx, argname)) - assert not in_rpcs + assert not in_rpcs and cmds return cmds def main(): From fae60e338639b3a09d2f26d8eb5feb3bb576b1fd Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Mon, 2 Oct 2017 13:35:08 +0200 Subject: [PATCH 2/2] qa: Fix lcov for out-of-tree builds --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index e3e71044da..81c84a8af4 100644 --- a/configure.ac +++ b/configure.ac @@ -1231,6 +1231,7 @@ AC_SUBST(QR_LIBS) AC_CONFIG_FILES([Makefile src/Makefile doc/man/Makefile share/setup.nsi share/qt/Info.plist test/config.ini]) AC_CONFIG_FILES([contrib/devtools/split-debug.sh],[chmod +x contrib/devtools/split-debug.sh]) AC_CONFIG_FILES([doc/Doxyfile]) +AC_CONFIG_LINKS([contrib/filter-lcov.py:contrib/filter-lcov.py]) AC_CONFIG_LINKS([test/functional/test_runner.py:test/functional/test_runner.py]) AC_CONFIG_LINKS([test/util/bitcoin-util-test.py:test/util/bitcoin-util-test.py])