diff options
| author | MarcoFalke <[email protected]> | 2019-11-05 15:18:59 -0500 |
|---|---|---|
| committer | MarcoFalke <[email protected]> | 2019-11-06 11:56:41 -0500 |
| commit | faec28252cf4f8e754c689a7a44fd421f631db50 (patch) | |
| tree | 8388cdbab437520619be106278739db3b06e7714 /src/qt | |
| parent | Merge #17368: cli: fix -getinfo output when compiled with no wallet (diff) | |
| download | discoin-faec28252cf4f8e754c689a7a44fd421f631db50.tar.xz discoin-faec28252cf4f8e754c689a7a44fd421f631db50.zip | |
scripted-diff: test: Move setup_common to test library
-BEGIN VERIFY SCRIPT-
# Move files
for f in $(git ls-files src/test/lib/); do git mv $f src/test/util/; done
git mv src/test/setup_common.cpp src/test/util/
git mv src/test/setup_common.h src/test/util/
# Replace Windows paths
sed -i -e 's|\\setup_common|\\util\\setup_common|g' $(git grep -l '\\setup_common')
sed -i -e 's|src\\test\\lib\\|src\\test\\util\\|g' build_msvc/test_bitcoin/test_bitcoin.vcxproj
# Everything else
sed -i -e 's|/setup_common|/util/setup_common|g' $(git grep -l 'setup_common')
sed -i -e 's|test/lib/|test/util/|g' $(git grep -l 'test/lib/')
# Fix include guard
sed -i -e 's|BITCOIN_TEST_SETUP_COMMON_H|BITCOIN_TEST_UTIL_SETUP_COMMON_H|g' ./src/test/util/setup_common.h
sed -i -e 's|BITCOIN_TEST_LIB_|BITCOIN_TEST_UTIL_|g' $(git grep -l 'BITCOIN_TEST_LIB_')
-END VERIFY SCRIPT-
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/test/addressbooktests.cpp | 2 | ||||
| -rw-r--r-- | src/qt/test/apptests.cpp | 2 | ||||
| -rw-r--r-- | src/qt/test/rpcnestedtests.cpp | 2 | ||||
| -rw-r--r-- | src/qt/test/test_main.cpp | 2 | ||||
| -rw-r--r-- | src/qt/test/wallettests.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/qt/test/addressbooktests.cpp b/src/qt/test/addressbooktests.cpp index 8b32b70d1..6e8d38384 100644 --- a/src/qt/test/addressbooktests.cpp +++ b/src/qt/test/addressbooktests.cpp @@ -1,6 +1,6 @@ #include <qt/test/addressbooktests.h> #include <qt/test/util.h> -#include <test/setup_common.h> +#include <test/util/setup_common.h> #include <interfaces/chain.h> #include <interfaces/node.h> diff --git a/src/qt/test/apptests.cpp b/src/qt/test/apptests.cpp index e730c8f6d..664826ecf 100644 --- a/src/qt/test/apptests.cpp +++ b/src/qt/test/apptests.cpp @@ -11,7 +11,7 @@ #include <qt/networkstyle.h> #include <qt/rpcconsole.h> #include <shutdown.h> -#include <test/setup_common.h> +#include <test/util/setup_common.h> #include <univalue.h> #include <validation.h> diff --git a/src/qt/test/rpcnestedtests.cpp b/src/qt/test/rpcnestedtests.cpp index 1772de4c1..971d9f4a7 100644 --- a/src/qt/test/rpcnestedtests.cpp +++ b/src/qt/test/rpcnestedtests.cpp @@ -7,7 +7,7 @@ #include <interfaces/node.h> #include <rpc/server.h> #include <qt/rpcconsole.h> -#include <test/setup_common.h> +#include <test/util/setup_common.h> #include <univalue.h> #include <util/system.h> diff --git a/src/qt/test/test_main.cpp b/src/qt/test/test_main.cpp index e6870cf1b..243c10d7d 100644 --- a/src/qt/test/test_main.cpp +++ b/src/qt/test/test_main.cpp @@ -12,7 +12,7 @@ #include <qt/test/rpcnestedtests.h> #include <qt/test/uritests.h> #include <qt/test/compattests.h> -#include <test/setup_common.h> +#include <test/util/setup_common.h> #ifdef ENABLE_WALLET #include <qt/test/addressbooktests.h> diff --git a/src/qt/test/wallettests.cpp b/src/qt/test/wallettests.cpp index 881653cda..fbf76452a 100644 --- a/src/qt/test/wallettests.cpp +++ b/src/qt/test/wallettests.cpp @@ -13,7 +13,7 @@ #include <qt/transactionview.h> #include <qt/walletmodel.h> #include <key_io.h> -#include <test/setup_common.h> +#include <test/util/setup_common.h> #include <validation.h> #include <wallet/wallet.h> #include <qt/overviewpage.h> |