diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-12-20 16:52:57 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-12-20 16:53:02 +0100 |
| commit | d4e404a3afa8898738e7ff8ce28a7fa1373f727e (patch) | |
| tree | 483b33dc517e91b56b6285274317724af6c306a5 /src/Makefile.test.include | |
| parent | 9ab9963386ed321bf845997674ebd2c997fb3b1f (diff) | |
| parent | 2862b562cc17f9d4507dab3b9281bf066b093e16 (diff) | |
Merge #11879: [tests] remove redundant univalue_tests.cpp
2862b56 [tests] remove redundant univalue_tests.cpp (John Newbery)
Pull request description:
univalue unit tests were added in #4730 , and exist at `/src/test/univalue_tests.cpp` (outside the univalue tree). That test was brought into the univalue repository in https://github.com/bitcoin-core/univalue/pull/4 , which was pulled into the github repository in https://github.com/bitcoin/bitcoin/pull/11420.
That means that the univalue test exists in two places:
1. `/src/test/univalue_tests.cpp`
2. `/src/univalue/test/object.cpp`
(2) is a strict superset of (1). It adds some macros to work around boost not being a univalue dependency, and adds a few extra lines of test.
Therefore remove `/src/test/univalue_tests.cpp`
Tree-SHA512: 3747b10bbf62e9f12363905488b29945ad559ddca68c5c03d8a362de612a51f408f41a04d3712c6889bfc1632fb1a5fa0d7df0fbf02c322b3981a6d698f501b0
Diffstat (limited to 'src/Makefile.test.include')
| -rw-r--r-- | src/Makefile.test.include | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/Makefile.test.include b/src/Makefile.test.include index 06175be3fc..49a814c3f6 100644 --- a/src/Makefile.test.include +++ b/src/Makefile.test.include @@ -84,7 +84,6 @@ BITCOIN_TESTS =\ test/txvalidationcache_tests.cpp \ test/versionbits_tests.cpp \ test/uint256_tests.cpp \ - test/univalue_tests.cpp \ test/util_tests.cpp if ENABLE_WALLET |