Skip to content

Commit a4c833f

Browse files
committed
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
2 parents 9ccafb1 + fae60e3 commit a4c833f

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

configure.ac

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1231,6 +1231,7 @@ AC_SUBST(QR_LIBS)
12311231
AC_CONFIG_FILES([Makefile src/Makefile doc/man/Makefile share/setup.nsi share/qt/Info.plist test/config.ini])
12321232
AC_CONFIG_FILES([contrib/devtools/split-debug.sh],[chmod +x contrib/devtools/split-debug.sh])
12331233
AC_CONFIG_FILES([doc/Doxyfile])
1234+
AC_CONFIG_LINKS([contrib/filter-lcov.py:contrib/filter-lcov.py])
12341235
AC_CONFIG_LINKS([test/functional/test_runner.py:test/functional/test_runner.py])
12351236
AC_CONFIG_LINKS([test/util/bitcoin-util-test.py:test/util/bitcoin-util-test.py])
12361237

contrib/devtools/check-rpc-mappings.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ def process_commands(fname):
6363
else:
6464
args = []
6565
cmds.append(RPCCommand(name, args))
66-
assert not in_rpcs, "Something went wrong with parsing the C++ file: update the regexps"
66+
assert not in_rpcs and cmds, "Something went wrong with parsing the C++ file: update the regexps"
6767
return cmds
6868

6969
def process_mapping(fname):
@@ -86,7 +86,7 @@ def process_mapping(fname):
8686
idx = int(m.group(2))
8787
argname = parse_string(m.group(3))
8888
cmds.append((name, idx, argname))
89-
assert not in_rpcs
89+
assert not in_rpcs and cmds
9090
return cmds
9191

9292
def main():

0 commit comments

Comments
 (0)