Skip to content

Commit

Permalink
Merge bitcoin#21531: test: remove qt byteswap compattests
Browse files Browse the repository at this point in the history
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
  • Loading branch information
MarcoFalke authored and knst committed Apr 9, 2024
1 parent ba883c5 commit 65b80e7
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 53 deletions.
3 changes: 0 additions & 3 deletions src/Makefile.qttest.include
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ TESTS += qt/test/test_dash-qt

TEST_QT_MOC_CPP = \
qt/test/moc_apptests.cpp \
qt/test/moc_compattests.cpp \
qt/test/moc_rpcnestedtests.cpp \
qt/test/moc_trafficgraphdatatests.cpp \
qt/test/moc_uritests.cpp
Expand All @@ -22,7 +21,6 @@ endif # ENABLE_WALLET
TEST_QT_H = \
qt/test/addressbooktests.h \
qt/test/apptests.h \
qt/test/compattests.h \
qt/test/rpcnestedtests.h \
qt/test/uritests.h \
qt/test/util.h \
Expand All @@ -34,7 +32,6 @@ qt_test_test_dash_qt_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_

qt_test_test_dash_qt_SOURCES = \
qt/test/apptests.cpp \
qt/test/compattests.cpp \
qt/test/rpcnestedtests.cpp \
qt/test/test_main.cpp \
qt/test/trafficgraphdatatests.cpp \
Expand Down
25 changes: 0 additions & 25 deletions src/qt/test/compattests.cpp

This file was deleted.

19 changes: 0 additions & 19 deletions src/qt/test/compattests.h

This file was deleted.

5 changes: 0 additions & 5 deletions src/qt/test/test_main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include <qt/test/apptests.h>
#include <qt/test/rpcnestedtests.h>
#include <qt/test/uritests.h>
#include <qt/test/compattests.h>
#include <qt/test/trafficgraphdatatests.h>
#include <test/util/setup_common.h>

Expand Down Expand Up @@ -92,10 +91,6 @@ int main(int argc, char* argv[])
if (QTest::qExec(&test3) != 0) {
fInvalid = true;
}
CompatTests test4;
if (QTest::qExec(&test4) != 0) {
fInvalid = true;
}
#ifdef ENABLE_WALLET
WalletTests test5(app.node());
if (QTest::qExec(&test5) != 0) {
Expand Down
1 change: 0 additions & 1 deletion src/test/bswap_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ BOOST_AUTO_TEST_SUITE(bswap_tests)

BOOST_AUTO_TEST_CASE(bswap_tests)
{
// Sibling in bitcoin/src/qt/test/compattests.cpp
uint16_t u1 = 0x1234;
uint32_t u2 = 0x56789abc;
uint64_t u3 = 0xdef0123456789abc;
Expand Down

0 comments on commit 65b80e7

Please sign in to comment.