aboutsummaryrefslogtreecommitdiff
path: root/src/Makefile.qttest.include
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2019-11-05 15:18:59 -0500
committerMarcoFalke <falke.marco@gmail.com>2019-11-06 11:56:41 -0500
commitfaec28252cf4f8e754c689a7a44fd421f631db50 (patch)
tree8388cdbab437520619be106278739db3b06e7714 /src/Makefile.qttest.include
parent7967104aee055476107dc17265cefc4ae4e75378 (diff)
downloadbitcoin-faec28252cf4f8e754c689a7a44fd421f631db50.tar.xz
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/Makefile.qttest.include')
-rw-r--r--src/Makefile.qttest.include4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile.qttest.include b/src/Makefile.qttest.include
index c309340fd7..562b393b22 100644
--- a/src/Makefile.qttest.include
+++ b/src/Makefile.qttest.include
@@ -27,10 +27,10 @@ TEST_QT_H = \
qt/test/wallettests.h
TEST_BITCOIN_CPP = \
- test/setup_common.cpp
+ test/util/setup_common.cpp
TEST_BITCOIN_H = \
- test/setup_common.h
+ test/util/setup_common.h
qt_test_test_bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(BITCOIN_INCLUDES) $(BITCOIN_QT_INCLUDES) \
$(QT_INCLUDES) $(QT_TEST_INCLUDES)