Rename --enable-extended-rpc-tests to --enable-extended-functional-tests

This commit is contained in:
John Newbery 2017-03-09 09:55:12 -05:00
parent a9bd622a65
commit 5b0bff4581
2 changed files with 7 additions and 7 deletions

View File

@ -195,7 +195,7 @@ test_bitcoin_filtered.info: test_bitcoin.info
$(LCOV) -r $< "/usr/include/*" -o $@ $(LCOV) -r $< "/usr/include/*" -o $@
functional_test.info: test_bitcoin_filtered.info functional_test.info: test_bitcoin_filtered.info
-@TIMEOUT=15 python test/functional/test_runner.py $(EXTENDED_RPC_TESTS) -@TIMEOUT=15 python test/functional/test_runner.py $(EXTENDED_FUNCTIONAL_TESTS)
$(LCOV) -c -d $(abs_builddir)/src --t functional-tests -o $@ $(LCOV) -c -d $(abs_builddir)/src --t functional-tests -o $@
$(LCOV) -z -d $(abs_builddir)/src $(LCOV) -z -d $(abs_builddir)/src
$(LCOV) -z -d $(abs_builddir)/src/leveldb $(LCOV) -z -d $(abs_builddir)/src/leveldb

View File

@ -124,10 +124,10 @@ AC_ARG_ENABLE(bench,
[use_bench=$enableval], [use_bench=$enableval],
[use_bench=yes]) [use_bench=yes])
AC_ARG_ENABLE([extended-rpc-tests], AC_ARG_ENABLE([extended-functional-tests],
AS_HELP_STRING([--enable-extended-rpc-tests],[enable expensive RPC tests when using lcov (default no)]), AS_HELP_STRING([--enable-extended-functional-tests],[enable expensive functional tests when using lcov (default no)]),
[use_extended_rpc_tests=$enableval], [use_extended_functional_tests=$enableval],
[use_extended_rpc_tests=no]) [use_extended_functional_tests=no])
AC_ARG_WITH([qrencode], AC_ARG_WITH([qrencode],
[AS_HELP_STRING([--with-qrencode], [AS_HELP_STRING([--with-qrencode],
@ -414,8 +414,8 @@ if test x$use_pkgconfig = xyes; then
]) ])
fi fi
if test x$use_extended_rpc_tests != xno; then if test x$use_extended_functional_tests != xno; then
AC_SUBST(EXTENDED_RPC_TESTS, -extended) AC_SUBST(EXTENDED_FUNCTIONAL_TESTS, --extended)
fi fi
if test x$use_lcov = xyes; then if test x$use_lcov = xyes; then