Skip to content

Commit 65b80e7

Browse files
MarcoFalkeknst
authored andcommitted
Merge bitcoin#21531: test: remove qt byteswap compattests
9ac86bc test: remove qt byteswap compattests (fanquake) Pull request description: These were added as part of bitcoin#9366 when with fixing issues with Protobuf. Now that we no-longer use Protobuf, there's no reason to maintain a duplicate set of byteswap tests in the qt tests. Our other set of byteswap tests are here: https://github.com/bitcoin/bitcoin/blob/master/src/test/bswap_tests.cpp. ACKs for top commit: laanwj: Code review ACK 9ac86bc Tree-SHA512: 72ba131a5f8fbd9fdbbc4e1f95baa794496c960b12e0271700c632c6511b7e1b331e8db07a201838b4d56b2aeeb43d4de4e10265ea07ab14241307fa14d3342e
1 parent ba883c5 commit 65b80e7

File tree

5 files changed

+0
-53
lines changed

5 files changed

+0
-53
lines changed

src/Makefile.qttest.include

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ TESTS += qt/test/test_dash-qt
88

99
TEST_QT_MOC_CPP = \
1010
qt/test/moc_apptests.cpp \
11-
qt/test/moc_compattests.cpp \
1211
qt/test/moc_rpcnestedtests.cpp \
1312
qt/test/moc_trafficgraphdatatests.cpp \
1413
qt/test/moc_uritests.cpp
@@ -22,7 +21,6 @@ endif # ENABLE_WALLET
2221
TEST_QT_H = \
2322
qt/test/addressbooktests.h \
2423
qt/test/apptests.h \
25-
qt/test/compattests.h \
2624
qt/test/rpcnestedtests.h \
2725
qt/test/uritests.h \
2826
qt/test/util.h \
@@ -34,7 +32,6 @@ qt_test_test_dash_qt_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_
3432

3533
qt_test_test_dash_qt_SOURCES = \
3634
qt/test/apptests.cpp \
37-
qt/test/compattests.cpp \
3835
qt/test/rpcnestedtests.cpp \
3936
qt/test/test_main.cpp \
4037
qt/test/trafficgraphdatatests.cpp \

src/qt/test/compattests.cpp

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

src/qt/test/compattests.h

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

src/qt/test/test_main.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#include <qt/test/apptests.h>
1313
#include <qt/test/rpcnestedtests.h>
1414
#include <qt/test/uritests.h>
15-
#include <qt/test/compattests.h>
1615
#include <qt/test/trafficgraphdatatests.h>
1716
#include <test/util/setup_common.h>
1817

@@ -92,10 +91,6 @@ int main(int argc, char* argv[])
9291
if (QTest::qExec(&test3) != 0) {
9392
fInvalid = true;
9493
}
95-
CompatTests test4;
96-
if (QTest::qExec(&test4) != 0) {
97-
fInvalid = true;
98-
}
9994
#ifdef ENABLE_WALLET
10095
WalletTests test5(app.node());
10196
if (QTest::qExec(&test5) != 0) {

src/test/bswap_tests.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ BOOST_AUTO_TEST_SUITE(bswap_tests)
1010

1111
BOOST_AUTO_TEST_CASE(bswap_tests)
1212
{
13-
// Sibling in bitcoin/src/qt/test/compattests.cpp
1413
uint16_t u1 = 0x1234;
1514
uint32_t u2 = 0x56789abc;
1615
uint64_t u3 = 0xdef0123456789abc;

0 commit comments

Comments
 (0)