Skip to content

Commit ec892d4

Browse files
laanwjcodablock
authored andcommitted
Merge bitcoin#11234: Remove redundant testutil.cpp|h files
d1138e3 Remove redundant testutil files (MeshCollider) Pull request description: The only function in testutil.cpp, `GetTempPath()` simply called `fs::temp_directory_path()` directly. This just tidies things up by removing that redundant function and the file containing it I can understand wanting a general util file for tests to use, but if there's nothing in it, we might as well remove it, it can always be added back later when it's put to use. Tree-SHA512: b923f99acf33328743755368a1aa90f5da4a7d5f61b163a4b0b894275c98db80a91edf8f051fbfb4893d970fda5a9078aae78a2672867ff521c4ca4b653c71c0
1 parent d643ada commit ec892d4

File tree

6 files changed

+3
-41
lines changed

6 files changed

+3
-41
lines changed

src/Makefile.qttest.include

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,10 @@ TEST_QT_H = \
2828
qt/test/wallettests.h
2929

3030
TEST_BITCOIN_CPP = \
31-
test/test_dash.cpp \
32-
test/testutil.cpp
31+
test/test_dash.cpp
3332

3433
TEST_BITCOIN_H = \
35-
test/test_dash.h \
36-
test/testutil.h
37-
34+
test/test_dash.h
3835
qt_test_test_dash_qt_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \
3936
$(QT_INCLUDES) $(QT_TEST_INCLUDES) $(PROTOBUF_CFLAGS)
4037

src/Makefile.test.include

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,6 @@ BITCOIN_TESTS =\
8989
test/test_dash.cpp \
9090
test/test_dash.h \
9191
test/test_dash_main.cpp \
92-
test/testutil.cpp \
93-
test/testutil.h \
9492
test/timedata_tests.cpp \
9593
test/torcontrol_tests.cpp \
9694
test/transaction_tests.cpp \

src/qt/test/rpcnestedtests.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include "rpc/register.h"
1212
#include "rpc/server.h"
1313
#include "rpcconsole.h"
14-
#include "test/testutil.h"
1514
#include "test/test_dash.h"
1615
#include "univalue.h"
1716
#include "util.h"

src/test/test_dash.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
#include "rpc/register.h"
2323
#include "script/sigcache.h"
2424

25-
#include "test/testutil.h"
26-
2725
#include "evo/specialtx.h"
2826
#include "evo/deterministicmns.h"
2927
#include "evo/cbtx.h"
@@ -71,7 +69,7 @@ TestingSetup::TestingSetup(const std::string& chainName) : BasicTestingSetup(cha
7169
// instead of unit tests, but for now we need these here.
7270
RegisterAllCoreRPCCommands(tableRPC);
7371
ClearDatadirCache();
74-
pathTemp = GetTempPath() / strprintf("test_dash_%lu_%i", (unsigned long)GetTime(), (int)(InsecureRandRange(100000)));
72+
pathTemp = fs::temp_directory_path() / strprintf("test_dash_%lu_%i", (unsigned long)GetTime(), (int)(InsecureRandRange(100000)));
7573
fs::create_directories(pathTemp);
7674
gArgs.ForceSetArg("-datadir", pathTemp.string());
7775

src/test/testutil.cpp

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

src/test/testutil.h

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

0 commit comments

Comments
 (0)