diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-10-04 14:23:08 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-10-04 14:26:03 +0200 |
| commit | a4c833fec104457c9ed31885821c2e5bbc7c65c4 (patch) | |
| tree | c6b03d617bf284747e95db23edba74469b58b0c4 | |
| parent | 9ccafb1d7bdd172a9b963444072a844da379c4f7 (diff) | |
| parent | fae60e338639b3a09d2f26d8eb5feb3bb576b1fd (diff) | |
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
| -rw-r--r-- | configure.ac | 1 | ||||
| -rwxr-xr-x | contrib/devtools/check-rpc-mappings.py | 4 |
2 files changed, 3 insertions, 2 deletions
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]) 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(): |