Skip to content

Commit cf11f9c

Browse files
author
MarcoFalke
committed
Merge #21531: test: remove qt byteswap compattests
9ac86bc test: remove qt byteswap compattests (fanquake) Pull request description: These were added as part of #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
2 parents 3bcd278 + 9ac86bc commit cf11f9c

File tree

6 files changed

+0
-56
lines changed

6 files changed

+0
-56
lines changed

build_msvc/test_bitcoin-qt/test_bitcoin-qt.vcxproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
<ClCompile Include="..\..\src\test\util\setup_common.cpp" />
1212
<ClCompile Include="..\..\src\qt\test\addressbooktests.cpp" />
1313
<ClCompile Include="..\..\src\qt\test\apptests.cpp" />
14-
<ClCompile Include="..\..\src\qt\test\compattests.cpp" />
1514
<ClCompile Include="..\..\src\qt\test\rpcnestedtests.cpp" />
1615
<ClCompile Include="..\..\src\qt\test\test_main.cpp" />
1716
<ClCompile Include="..\..\src\qt\test\uritests.cpp" />
@@ -20,7 +19,6 @@
2019
<ClCompile Include="..\..\src\wallet\test\wallet_test_fixture.cpp" />
2120
<ClCompile Include="$(GeneratedFilesOutDir)\moc\moc_addressbooktests.cpp" />
2221
<ClCompile Include="$(GeneratedFilesOutDir)\moc\moc_apptests.cpp" />
23-
<ClCompile Include="$(GeneratedFilesOutDir)\moc\moc_compattests.cpp" />
2422
<ClCompile Include="$(GeneratedFilesOutDir)\moc\moc_rpcnestedtests.cpp" />
2523
<ClCompile Include="$(GeneratedFilesOutDir)\moc\moc_uritests.cpp" />
2624
<ClCompile Include="$(GeneratedFilesOutDir)\moc\moc_wallettests.cpp" />
@@ -89,7 +87,6 @@
8987
<ItemGroup>
9088
<MocTestFiles Include="..\..\src\qt\test\addressbooktests.h" />
9189
<MocTestFiles Include="..\..\src\qt\test\apptests.h" />
92-
<MocTestFiles Include="..\..\src\qt\test\compattests.h" />
9390
<MocTestFiles Include="..\..\src\qt\test\rpcnestedtests.h" />
9491
<MocTestFiles Include="..\..\src\qt\test\uritests.h" />
9592
<MocTestFiles Include="..\..\src\qt\test\wallettests.h" />

src/Makefile.qttest.include

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

88
TEST_QT_MOC_CPP = \
99
qt/test/moc_apptests.cpp \
10-
qt/test/moc_compattests.cpp \
1110
qt/test/moc_rpcnestedtests.cpp \
1211
qt/test/moc_uritests.cpp
1312

@@ -20,7 +19,6 @@ endif # ENABLE_WALLET
2019
TEST_QT_H = \
2120
qt/test/addressbooktests.h \
2221
qt/test/apptests.h \
23-
qt/test/compattests.h \
2422
qt/test/rpcnestedtests.h \
2523
qt/test/uritests.h \
2624
qt/test/util.h \
@@ -31,7 +29,6 @@ qt_test_test_bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_
3129

3230
qt_test_test_bitcoin_qt_SOURCES = \
3331
qt/test/apptests.cpp \
34-
qt/test/compattests.cpp \
3532
qt/test/rpcnestedtests.cpp \
3633
qt/test/test_main.cpp \
3734
qt/test/uritests.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
@@ -11,7 +11,6 @@
1111
#include <qt/test/apptests.h>
1212
#include <qt/test/rpcnestedtests.h>
1313
#include <qt/test/uritests.h>
14-
#include <qt/test/compattests.h>
1514
#include <test/util/setup_common.h>
1615

1716
#ifdef ENABLE_WALLET
@@ -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
@@ -11,7 +11,6 @@ BOOST_FIXTURE_TEST_SUITE(bswap_tests, BasicTestingSetup)
1111

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

0 commit comments

Comments
 (0)