aboutsummaryrefslogtreecommitdiff
path: root/src/Makefile.qttest.include
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2019-11-07 08:01:59 -0500
committerMarcoFalke <falke.marco@gmail.com>2019-11-07 08:02:25 -0500
commit46fc4d1a24c88e797d6080336e3828e45e39c3fd (patch)
tree1df0e2070c7581fdbf56b2a295751b212ab44cd6 /src/Makefile.qttest.include
parente65b4160e99fa86d6d840dce75cae29334afd1f2 (diff)
parentfa4c6fa9b1139791f45f1495d662c1c7cd2f7ed6 (diff)
Merge #17384: test: Create new test library
fa4c6fa9b1139791f45f1495d662c1c7cd2f7ed6 doc: Add documentation for new test/lib (MarcoFalke) faec28252cf4f8e754c689a7a44fd421f631db50 scripted-diff: test: Move setup_common to test library (MarcoFalke) Pull request description: Sorry for clickbait, this is only a move-only scripted-diff commit and one documentation commit. Longer term, someone who knows something about build systems can make this an actual library. Motivation for this is that each module gets compiled for each target that includes it. For example, setup_common is compiled 27 times (for the fuzz suite) and another 3 times for the other tests (bench, unit test, gui) ACKs for top commit: practicalswift: ACK fa4c6fa9b1139791f45f1495d662c1c7cd2f7ed6 -- diff looks correct and Travis is happy jonatack: ACK fa4c6fa9b1139791f45f1495d662c1c7cd2f7ed6 with the reserve that the commit messages (and PR description) contain the motivation for this change. Built, ran tests, light code review. ryanofsky: Code review ACK fa4c6fa9b1139791f45f1495d662c1c7cd2f7ed6. I didn't realize `lib` was actually name of existing directory, not a new name. But in any case this looks good and nice to have one scripted diff instead of two. Tree-SHA512: 2e176df90c60578276e4a6dc83ff57ff59d8e666ecf30c5ceacb8c326725da91baa4cac3dfa7a2e1605f58122a3e3e27e4938ff33e3a0ce7ea53afffebbf57a4
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)