Github-Pull: #11234
Rebased-From: d1138e3620
tags/v0.15.1
@@ -25,12 +25,10 @@ TEST_QT_H = \ | |||
qt/test/wallettests.h | |||
TEST_BITCOIN_CPP = \ | |||
test/test_bitcoin.cpp \ | |||
test/testutil.cpp | |||
test/test_bitcoin.cpp | |||
TEST_BITCOIN_H = \ | |||
test/test_bitcoin.h \ | |||
test/testutil.h | |||
test/test_bitcoin.h | |||
qt_test_test_bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \ | |||
$(QT_INCLUDES) $(QT_TEST_INCLUDES) $(PROTOBUF_CFLAGS) |
@@ -74,8 +74,6 @@ BITCOIN_TESTS =\ | |||
test/test_bitcoin.cpp \ | |||
test/test_bitcoin.h \ | |||
test/test_bitcoin_main.cpp \ | |||
test/testutil.cpp \ | |||
test/testutil.h \ | |||
test/timedata_tests.cpp \ | |||
test/torcontrol_tests.cpp \ | |||
test/transaction_tests.cpp \ |
@@ -11,7 +11,6 @@ | |||
#include "rpc/register.h" | |||
#include "rpc/server.h" | |||
#include "rpcconsole.h" | |||
#include "test/testutil.h" | |||
#include "test/test_bitcoin.h" | |||
#include "univalue.h" | |||
#include "util.h" |
@@ -22,8 +22,6 @@ | |||
#include "rpc/register.h" | |||
#include "script/sigcache.h" | |||
#include "test/testutil.h" | |||
#include <memory> | |||
uint256 insecure_rand_seed = GetRandHash(); | |||
@@ -61,7 +59,7 @@ TestingSetup::TestingSetup(const std::string& chainName) : BasicTestingSetup(cha | |||
RegisterAllCoreRPCCommands(tableRPC); | |||
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); | |||
gArgs.ForceSetArg("-datadir", pathTemp.string()); | |||
@@ -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(); | |||
} |
@@ -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 |