Merge #11443: [qa] Allow "make cov" out-of-tree; Fix rpc mapping check

fae60e3 qa: Fix lcov for out-of-tree builds (MarcoFalke)
fae2673 qa: check-rpc-mapping must not run on empty lists (MarcoFalke)

Pull request description:

  Random qa fixups:

  * `make cov` should work for out-of-tree builds
  * `check-rpc-mappings.py` should assert that it is actually checking something and the lists are not empty.

Tree-SHA512: 2b66f69d6a1ae035c772f8ceb1d58dce904d98058330dad6ccb1421941e167aa748fe1c12126b87f43b0843f51fa85d89de079d586629fcaf8261c44a8dc6053
This commit is contained in:
Wladimir J. van der Laan 2017-10-04 14:23:08 +02:00
commit a4c833fec1
No known key found for this signature in database
GPG Key ID: 1E4AED62986CD25D
2 changed files with 3 additions and 2 deletions

View File

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

View File

@ -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():