Skip to content

Commit 516ebe8

Browse files
committed
Merge #18514: test: remove rapidcheck integration and tests
9e071b0 test: remove rapidcheck integration and tests (fanquake) Pull request description: Whilst the property tests are interesting, ultimately [rapidcheck](https://github.com/emil-e/rapidcheck) integration in this repository has not gained much traction. We have a limited number of tests, and they are rarely (if ever) run. Have discussed this with Chris Stewart. ACKs for top commit: practicalswift: ACK 9e071b0 Tree-SHA512: d0c12af3163382eee8413da420c63e39265a7b700709a05d518445832d45e049aed9508e32524db5228fe3ac114609a00b7bb890be047c07032e44a5ef4611e9
2 parents cf21293 + 9e071b0 commit 516ebe8

File tree

12 files changed

+3
-281
lines changed

12 files changed

+3
-281
lines changed

build_msvc/README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Quick Start
1212
The minimal steps required to build Bitcoin Core with the msbuild toolchain are below. More detailed instructions are contained in the following sections.
1313

1414
```
15-
vcpkg install --triplet x64-windows-static berkeleydb boost-filesystem boost-multi-index boost-signals2 boost-test boost-thread libevent[thread] rapidcheck zeromq double-conversion
15+
vcpkg install --triplet x64-windows-static berkeleydb boost-filesystem boost-multi-index boost-signals2 boost-test boost-thread libevent[thread] zeromq double-conversion
1616
vcpkg integrate install
1717
py -3 build_msvc\msvc-autogen.py
1818
msbuild /m build_msvc\bitcoin.sln /p:Platform=x64 /p:Configuration=Release /t:build
@@ -35,7 +35,6 @@ The [external dependencies](https://github.com/bitcoin/bitcoin/blob/master/doc/d
3535
- DoubleConversion
3636
- libevent
3737
- Qt5
38-
- RapidCheck
3938
- ZeroMQ
4039

4140
Qt

build_msvc/vcpkg-packages.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
berkeleydb boost-filesystem boost-multi-index boost-signals2 boost-test boost-thread libevent[thread] rapidcheck zeromq double-conversion
1+
berkeleydb boost-filesystem boost-multi-index boost-signals2 boost-test boost-thread libevent[thread] zeromq double-conversion

configure.ac

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -134,12 +134,6 @@ AC_ARG_ENABLE(gui-tests,
134134
[use_gui_tests=$enableval],
135135
[use_gui_tests=$use_tests])
136136

137-
AC_ARG_WITH([rapidcheck],
138-
[AS_HELP_STRING([--with-rapidcheck],
139-
[enable RapidCheck property-based tests (default is yes if librapidcheck is found)])],
140-
[use_rapidcheck=$withval],
141-
[use_rapidcheck=auto])
142-
143137
AC_ARG_ENABLE(bench,
144138
AS_HELP_STRING([--disable-bench],[do not compile benchmarks (default is to compile)]),
145139
[use_bench=$enableval],
@@ -1327,22 +1321,6 @@ else
13271321
fi
13281322
fi
13291323

1330-
dnl RapidCheck property-based testing
1331-
1332-
enable_property_tests=no
1333-
if test "x$use_rapidcheck" = xauto; then
1334-
AC_CHECK_HEADERS([rapidcheck.h], [enable_property_tests=yes])
1335-
elif test "x$use_rapidcheck" != xno; then
1336-
enable_property_tests=yes
1337-
fi
1338-
1339-
RAPIDCHECK_LIBS=
1340-
if test "x$enable_property_tests" = xyes; then
1341-
RAPIDCHECK_LIBS=-lrapidcheck
1342-
fi
1343-
AC_SUBST(RAPIDCHECK_LIBS)
1344-
AM_CONDITIONAL([ENABLE_PROPERTY_TESTS], [test x$enable_property_tests = xyes])
1345-
13461324
dnl univalue check
13471325

13481326
need_bundled_univalue=yes
@@ -1679,7 +1657,6 @@ fi
16791657
echo " with zmq = $use_zmq"
16801658
echo " with test = $use_tests"
16811659
if test x$use_tests != xno; then
1682-
echo " with prop = $enable_property_tests"
16831660
echo " with fuzz = $enable_fuzz"
16841661
fi
16851662
echo " with bench = $use_bench"

depends/Makefile

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ BASE_CACHE ?= $(BASEDIR)/built
1010
SDK_PATH ?= $(BASEDIR)/SDKs
1111
NO_QT ?=
1212
NO_QR ?=
13-
RAPIDCHECK ?=
1413
NO_WALLET ?=
1514
NO_ZMQ ?=
1615
NO_UPNP ?=
@@ -109,19 +108,13 @@ wallet_packages_$(NO_WALLET) = $(wallet_packages)
109108
upnp_packages_$(NO_UPNP) = $(upnp_packages)
110109
zmq_packages_$(NO_ZMQ) = $(zmq_packages)
111110

112-
rapidcheck_packages_$(RAPIDCHECK) = $(rapidcheck_packages)
113-
114111
packages += $($(host_arch)_$(host_os)_packages) $($(host_os)_packages) $(qt_packages_) $(wallet_packages_) $(upnp_packages_)
115112
native_packages += $($(host_arch)_$(host_os)_native_packages) $($(host_os)_native_packages)
116113

117114
ifneq ($(zmq_packages_),)
118115
packages += $(zmq_packages)
119116
endif
120117

121-
ifeq ($(rapidcheck_packages_),)
122-
packages += $(rapidcheck_packages)
123-
endif
124-
125118
all_packages = $(packages) $(native_packages)
126119

127120
meta_depends = Makefile funcs.mk builders/default.mk hosts/default.mk hosts/$(host_os).mk builders/$(build_os).mk

depends/README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ The following can be set when running make: make FOO=bar
9292
NO_WALLET: Don't download/build/cache libs needed to enable the wallet
9393
NO_UPNP: Don't download/build/cache packages needed for enabling upnp
9494
DEBUG: disable some optimizations and enable more runtime checking
95-
RAPIDCHECK: build rapidcheck (experimental, requires cmake)
9695
HOST_ID_SALT: Optional salt to use when generating host package ids
9796
BUILD_ID_SALT: Optional salt to use when generating build package ids
9897

depends/packages/packages.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ qrencode_packages = qrencode
77
qt_linux_packages:=qt expat libxcb xcb_proto libXau xproto freetype fontconfig
88
qt_android_packages=qt
99

10-
rapidcheck_packages = rapidcheck
11-
1210
qt_darwin_packages=qt
1311
qt_mingw32_packages=qt
1412

depends/packages/rapidcheck.mk

Lines changed: 0 additions & 21 deletions
This file was deleted.

doc/rapidcheck.md

Lines changed: 0 additions & 84 deletions
This file was deleted.

src/Makefile.test.include

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -241,15 +241,6 @@ BITCOIN_TESTS =\
241241
test/validation_flush_tests.cpp \
242242
test/versionbits_tests.cpp
243243

244-
if ENABLE_PROPERTY_TESTS
245-
BITCOIN_TESTS += \
246-
test/key_properties.cpp
247-
248-
BITCOIN_TEST_SUITE += \
249-
test/gen/crypto_gen.cpp \
250-
test/gen/crypto_gen.h
251-
endif
252-
253244
if ENABLE_WALLET
254245
BITCOIN_TESTS += \
255246
wallet/test/db_tests.cpp \
@@ -279,7 +270,7 @@ test_test_bitcoin_LDADD += $(LIBBITCOIN_SERVER) $(LIBBITCOIN_CLI) $(LIBBITCOIN_C
279270
$(LIBLEVELDB) $(LIBLEVELDB_SSE42) $(LIBMEMENV) $(BOOST_LIBS) $(BOOST_UNIT_TEST_FRAMEWORK_LIB) $(LIBSECP256K1) $(EVENT_LIBS) $(EVENT_PTHREADS_LIBS)
280271
test_test_bitcoin_CXXFLAGS = $(AM_CXXFLAGS) $(PIE_FLAGS)
281272

282-
test_test_bitcoin_LDADD += $(BDB_LIBS) $(MINIUPNPC_LIBS) $(RAPIDCHECK_LIBS)
273+
test_test_bitcoin_LDADD += $(BDB_LIBS) $(MINIUPNPC_LIBS)
283274
test_test_bitcoin_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS) -static
284275

285276
if ENABLE_ZMQ

src/test/gen/crypto_gen.cpp

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)