test: Remove java comparison tool
This commit is contained in:
parent
d70027148d
commit
57ab896ba4
33
Makefile.am
33
Makefile.am
|
@ -41,9 +41,9 @@ WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/bitcoin.ico \
|
||||||
## $(top_srcdir)/contrib/macdeploy/detached-sig-apply.sh \
|
## $(top_srcdir)/contrib/macdeploy/detached-sig-apply.sh \
|
||||||
## $(top_srcdir)/contrib/macdeploy/detached-sig-create.sh
|
## $(top_srcdir)/contrib/macdeploy/detached-sig-create.sh
|
||||||
|
|
||||||
COVERAGE_INFO = baseline_filtered_combined.info baseline.info block_test.info \
|
COVERAGE_INFO = baseline_filtered_combined.info baseline.info \
|
||||||
leveldb_baseline.info test_bitcoin_filtered.info total_coverage.info \
|
leveldb_baseline.info test_bitcoin_filtered.info total_coverage.info \
|
||||||
baseline_filtered.info block_test_filtered.info \
|
baseline_filtered.info \
|
||||||
leveldb_baseline_filtered.info test_bitcoin_coverage.info test_bitcoin.info \
|
leveldb_baseline_filtered.info test_bitcoin_coverage.info test_bitcoin.info \
|
||||||
zcash-gtest.info zcash-gtest_filtered.info zcash-gtest_coverage.info
|
zcash-gtest.info zcash-gtest_filtered.info zcash-gtest_coverage.info
|
||||||
|
|
||||||
|
@ -215,33 +215,14 @@ zcash-gtest_filtered.info: zcash-gtest.info
|
||||||
"$(abs_builddir)/src/wallet/test/*" \
|
"$(abs_builddir)/src/wallet/test/*" \
|
||||||
-o $@
|
-o $@
|
||||||
|
|
||||||
block_test.info: test_bitcoin_filtered.info
|
|
||||||
$(MKDIR_P) qa/tmp
|
|
||||||
-@TIMEOUT=15 qa/pull-tester/run-bitcoind-for-test.sh $(JAVA) -jar $(JAVA_COMPARISON_TOOL) qa/tmp/compTool 0
|
|
||||||
$(LCOV) -c -d $(abs_builddir)/src --t BitcoinJBlockTest -o $@
|
|
||||||
$(LCOV) -z -d $(abs_builddir)/src
|
|
||||||
$(LCOV) -z -d $(abs_builddir)/src/leveldb
|
|
||||||
|
|
||||||
block_test_filtered.info: block_test.info
|
|
||||||
$(LCOV) -r $< "/usr/include/*" \
|
|
||||||
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/*.h" \
|
|
||||||
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/boost/*" \
|
|
||||||
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gmock/*" \
|
|
||||||
"$(abs_builddir)/depends/x86_64-unknown-linux-gnu/include/gtest/*" \
|
|
||||||
"$(abs_builddir)/src/gtest/*" \
|
|
||||||
"$(abs_builddir)/src/test/*" \
|
|
||||||
"$(abs_builddir)/src/wallet/gtest/*" \
|
|
||||||
"$(abs_builddir)/src/wallet/test/*" \
|
|
||||||
-o $@
|
|
||||||
|
|
||||||
test_bitcoin_coverage.info: baseline_filtered_combined.info test_bitcoin_filtered.info
|
test_bitcoin_coverage.info: baseline_filtered_combined.info test_bitcoin_filtered.info
|
||||||
$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -o $@
|
$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -o $@
|
||||||
|
|
||||||
zcash-gtest_coverage.info: baseline_filtered_combined.info zcash-gtest_filtered.info
|
zcash-gtest_coverage.info: baseline_filtered_combined.info zcash-gtest_filtered.info
|
||||||
$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a zcash-gtest_filtered.info -o $@
|
$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a zcash-gtest_filtered.info -o $@
|
||||||
|
|
||||||
total_coverage.info: baseline_filtered_combined.info test_bitcoin_filtered.info zcash-gtest_filtered.info block_test_filtered.info
|
total_coverage.info: baseline_filtered_combined.info test_bitcoin_filtered.info zcash-gtest_filtered.info
|
||||||
$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -a zcash-gtest_filtered.info -a block_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt
|
$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -a zcash-gtest_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt
|
||||||
|
|
||||||
test_bitcoin.coverage/.dirstamp: test_bitcoin_coverage.info
|
test_bitcoin.coverage/.dirstamp: test_bitcoin_coverage.info
|
||||||
$(GENHTML) -s $< -o $(@D)
|
$(GENHTML) -s $< -o $(@D)
|
||||||
|
@ -261,12 +242,6 @@ cov: test_bitcoin.coverage/.dirstamp cov-zcash total.coverage/.dirstamp
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if USE_COMPARISON_TOOL
|
|
||||||
check-local:
|
|
||||||
$(MKDIR_P) qa/tmp
|
|
||||||
@qa/pull-tester/run-bitcoind-for-test.sh $(JAVA) -jar $(JAVA_COMPARISON_TOOL) qa/tmp/compTool $(COMPARISON_TOOL_REORG_TESTS) 2>&1
|
|
||||||
endif
|
|
||||||
|
|
||||||
dist_bin_SCRIPTS = zcutil/fetch-params.sh
|
dist_bin_SCRIPTS = zcutil/fetch-params.sh
|
||||||
dist_noinst_SCRIPTS = autogen.sh zcutil/build-debian-package.sh zcutil/build.sh
|
dist_noinst_SCRIPTS = autogen.sh zcutil/build-debian-package.sh zcutil/build.sh
|
||||||
|
|
||||||
|
|
35
configure.ac
35
configure.ac
|
@ -66,7 +66,6 @@ AC_PATH_TOOL(RANLIB, ranlib)
|
||||||
AC_PATH_TOOL(STRIP, strip)
|
AC_PATH_TOOL(STRIP, strip)
|
||||||
AC_PATH_TOOL(GCOV, gcov)
|
AC_PATH_TOOL(GCOV, gcov)
|
||||||
AC_PATH_PROG(LCOV, lcov)
|
AC_PATH_PROG(LCOV, lcov)
|
||||||
AC_PATH_PROG(JAVA, java)
|
|
||||||
AC_PATH_PROG(GENHTML, genhtml)
|
AC_PATH_PROG(GENHTML, genhtml)
|
||||||
AC_PATH_PROG([GIT], [git])
|
AC_PATH_PROG([GIT], [git])
|
||||||
AC_PATH_PROG(CCACHE,ccache)
|
AC_PATH_PROG(CCACHE,ccache)
|
||||||
|
@ -105,16 +104,6 @@ AC_ARG_ENABLE(tests,
|
||||||
[use_tests=$enableval],
|
[use_tests=$enableval],
|
||||||
[use_tests=yes])
|
[use_tests=yes])
|
||||||
|
|
||||||
AC_ARG_WITH([comparison-tool],
|
|
||||||
AS_HELP_STRING([--with-comparison-tool],[path to java comparison tool (requires --enable-tests)]),
|
|
||||||
[use_comparison_tool=$withval],
|
|
||||||
[use_comparison_tool=no])
|
|
||||||
|
|
||||||
AC_ARG_ENABLE([comparison-tool-reorg-tests],
|
|
||||||
AS_HELP_STRING([--enable-comparison-tool-reorg-tests],[enable expensive reorg tests in the comparison tool (default no)]),
|
|
||||||
[use_comparison_tool_reorg_tests=$enableval],
|
|
||||||
[use_comparison_tool_reorg_tests=no])
|
|
||||||
|
|
||||||
AC_ARG_ENABLE([hardening],
|
AC_ARG_ENABLE([hardening],
|
||||||
[AS_HELP_STRING([--enable-hardening],
|
[AS_HELP_STRING([--enable-hardening],
|
||||||
[attempt to harden the resulting executables (default is yes)])],
|
[attempt to harden the resulting executables (default is yes)])],
|
||||||
|
@ -352,22 +341,6 @@ if test x$use_pkgconfig = xyes; then
|
||||||
])
|
])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test x$use_comparison_tool != xno; then
|
|
||||||
if test x$JAVA = x; then
|
|
||||||
AC_MSG_ERROR("comparison tool set but java not found")
|
|
||||||
fi
|
|
||||||
AC_SUBST(JAVA_COMPARISON_TOOL, $use_comparison_tool)
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test x$use_comparison_tool_reorg_tests != xno; then
|
|
||||||
if test x$use_comparison_tool = x; then
|
|
||||||
AC_MSG_ERROR("comparison tool reorg tests but comparison tool was not specified")
|
|
||||||
fi
|
|
||||||
AC_SUBST(COMPARISON_TOOL_REORG_TESTS, 1)
|
|
||||||
else
|
|
||||||
AC_SUBST(COMPARISON_TOOL_REORG_TESTS, 0)
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test x$use_lcov = xyes; then
|
if test x$use_lcov = xyes; then
|
||||||
if test x$LCOV = x; then
|
if test x$LCOV = x; then
|
||||||
AC_MSG_ERROR("lcov testing requested but lcov not found")
|
AC_MSG_ERROR("lcov testing requested but lcov not found")
|
||||||
|
@ -375,15 +348,9 @@ if test x$use_lcov = xyes; then
|
||||||
if test x$GCOV = x; then
|
if test x$GCOV = x; then
|
||||||
AC_MSG_ERROR("lcov testing requested but gcov not found")
|
AC_MSG_ERROR("lcov testing requested but gcov not found")
|
||||||
fi
|
fi
|
||||||
if test x$JAVA = x; then
|
|
||||||
AC_MSG_ERROR("lcov testing requested but java not found")
|
|
||||||
fi
|
|
||||||
if test x$GENHTML = x; then
|
if test x$GENHTML = x; then
|
||||||
AC_MSG_ERROR("lcov testing requested but genhtml not found")
|
AC_MSG_ERROR("lcov testing requested but genhtml not found")
|
||||||
fi
|
fi
|
||||||
if test x$use_comparison_tool = x; then
|
|
||||||
AC_MSG_ERROR("lcov testing requested but comparison tool was not specified")
|
|
||||||
fi
|
|
||||||
LCOV="$LCOV --gcov-tool=$GCOV --rc lcov_branch_coverage=1"
|
LCOV="$LCOV --gcov-tool=$GCOV --rc lcov_branch_coverage=1"
|
||||||
GENHTML="$GENHTML --branch-coverage"
|
GENHTML="$GENHTML --branch-coverage"
|
||||||
AX_CHECK_COMPILE_FLAG([--coverage],[CXXFLAGS="$CXXFLAGS --coverage"],
|
AX_CHECK_COMPILE_FLAG([--coverage],[CXXFLAGS="$CXXFLAGS --coverage"],
|
||||||
|
@ -832,8 +799,6 @@ AM_CONDITIONAL([ENABLE_MINING],[test x$enable_mining = xyes])
|
||||||
AM_CONDITIONAL([ENABLE_RUST],[test x$enable_rust = xyes])
|
AM_CONDITIONAL([ENABLE_RUST],[test x$enable_rust = xyes])
|
||||||
AM_CONDITIONAL([ENABLE_TESTS],[test x$BUILD_TEST = xyes])
|
AM_CONDITIONAL([ENABLE_TESTS],[test x$BUILD_TEST = xyes])
|
||||||
AM_CONDITIONAL([USE_LCOV],[test x$use_lcov = xyes])
|
AM_CONDITIONAL([USE_LCOV],[test x$use_lcov = xyes])
|
||||||
AM_CONDITIONAL([USE_COMPARISON_TOOL],[test x$use_comparison_tool != xno])
|
|
||||||
AM_CONDITIONAL([USE_COMPARISON_TOOL_REORG_TESTS],[test x$use_comparison_tool_reorg_test != xno])
|
|
||||||
AM_CONDITIONAL([GLIBC_BACK_COMPAT],[test x$use_glibc_compat = xyes])
|
AM_CONDITIONAL([GLIBC_BACK_COMPAT],[test x$use_glibc_compat = xyes])
|
||||||
AM_CONDITIONAL([HARDEN],[test x$use_hardening = xyes])
|
AM_CONDITIONAL([HARDEN],[test x$use_hardening = xyes])
|
||||||
|
|
||||||
|
|
|
@ -7,10 +7,6 @@ ac_tool_prefix=${host_alias}-
|
||||||
if test -z $with_boost; then
|
if test -z $with_boost; then
|
||||||
with_boost=$depends_prefix
|
with_boost=$depends_prefix
|
||||||
fi
|
fi
|
||||||
# Disable comparison utility (#592)
|
|
||||||
#if test -z $with_comparison_tool; then
|
|
||||||
# with_comparison_tool=$depends_prefix/native/share/BitcoindComparisonTool_jar/BitcoindComparisonTool.jar
|
|
||||||
#fi
|
|
||||||
|
|
||||||
|
|
||||||
if test -z $enable_wallet && test -n "@no_wallet@"; then
|
if test -z $enable_wallet && test -n "@no_wallet@"; then
|
||||||
|
|
Loading…
Reference in New Issue