Browse Source

Merge #11234: Remove redundant testutil.cpp|h files

d1138e362 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
0.16
Wladimir J. van der Laan 7 years ago
parent
commit
001041df81
No known key found for this signature in database
GPG Key ID: 1E4AED62986CD25D
  1. 6
      src/Makefile.qttest.include
  2. 2
      src/Makefile.test.include
  3. 1
      src/qt/test/rpcnestedtests.cpp
  4. 4
      src/test/test_bitcoin.cpp
  5. 15
      src/test/testutil.cpp
  6. 15
      src/test/testutil.h

6
src/Makefile.qttest.include

@ -25,12 +25,10 @@ TEST_QT_H = \
qt/test/wallettests.h qt/test/wallettests.h
TEST_BITCOIN_CPP = \ TEST_BITCOIN_CPP = \
test/test_bitcoin.cpp \ test/test_bitcoin.cpp
test/testutil.cpp
TEST_BITCOIN_H = \ TEST_BITCOIN_H = \
test/test_bitcoin.h \ test/test_bitcoin.h
test/testutil.h
qt_test_test_bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \ qt_test_test_bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \
$(QT_INCLUDES) $(QT_TEST_INCLUDES) $(PROTOBUF_CFLAGS) $(QT_INCLUDES) $(QT_TEST_INCLUDES) $(PROTOBUF_CFLAGS)

2
src/Makefile.test.include

@ -74,8 +74,6 @@ BITCOIN_TESTS =\
test/test_bitcoin.cpp \ test/test_bitcoin.cpp \
test/test_bitcoin.h \ test/test_bitcoin.h \
test/test_bitcoin_main.cpp \ test/test_bitcoin_main.cpp \
test/testutil.cpp \
test/testutil.h \
test/timedata_tests.cpp \ test/timedata_tests.cpp \
test/torcontrol_tests.cpp \ test/torcontrol_tests.cpp \
test/transaction_tests.cpp \ test/transaction_tests.cpp \

1
src/qt/test/rpcnestedtests.cpp

@ -11,7 +11,6 @@
#include "rpc/register.h" #include "rpc/register.h"
#include "rpc/server.h" #include "rpc/server.h"
#include "rpcconsole.h" #include "rpcconsole.h"
#include "test/testutil.h"
#include "test/test_bitcoin.h" #include "test/test_bitcoin.h"
#include "univalue.h" #include "univalue.h"
#include "util.h" #include "util.h"

4
src/test/test_bitcoin.cpp

@ -22,8 +22,6 @@
#include "rpc/register.h" #include "rpc/register.h"
#include "script/sigcache.h" #include "script/sigcache.h"
#include "test/testutil.h"
#include <memory> #include <memory>
uint256 insecure_rand_seed = GetRandHash(); uint256 insecure_rand_seed = GetRandHash();
@ -61,7 +59,7 @@ TestingSetup::TestingSetup(const std::string& chainName) : BasicTestingSetup(cha
RegisterAllCoreRPCCommands(tableRPC); RegisterAllCoreRPCCommands(tableRPC);
ClearDatadirCache(); ClearDatadirCache();
pathTemp = GetTempPath() / strprintf("test_bitcoin_%lu_%i", (unsigned long)GetTime(), (int)(InsecureRandRange(100000))); pathTemp = fs::temp_directory_path() / strprintf("test_bitcoin_%lu_%i", (unsigned long)GetTime(), (int)(InsecureRandRange(100000)));
fs::create_directories(pathTemp); fs::create_directories(pathTemp);
gArgs.ForceSetArg("-datadir", pathTemp.string()); gArgs.ForceSetArg("-datadir", pathTemp.string());

15
src/test/testutil.cpp

@ -1,15 +0,0 @@
// Copyright (c) 2009-2016 The Bitcoin Core developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "testutil.h"
#ifdef WIN32
#include <shlobj.h>
#endif
#include "fs.h"
fs::path GetTempPath() {
return fs::temp_directory_path();
}

15
src/test/testutil.h

@ -1,15 +0,0 @@
// Copyright (c) 2009-2016 The Bitcoin Core developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
/**
* Utility functions shared by unit tests
*/
#ifndef BITCOIN_TEST_TESTUTIL_H
#define BITCOIN_TEST_TESTUTIL_H
#include "fs.h"
fs::path GetTempPath();
#endif // BITCOIN_TEST_TESTUTIL_H
Loading…
Cancel
Save