Change tests' default installation folder from TARGET to folder name

Instead of having tests installed into a folder named like their
target, we now use their source folder name for the installation.

An upcoming patch will rely on this behavior and simplify creation
of tests that need helper applications.

Change-Id: I17d9ff15edf502d82ab698627189532b83e72546
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
bb10
Oliver Wolff 2018-07-02 15:29:14 +02:00
parent 8d8a830f13
commit 64d63d036c
1 changed files with 4 additions and 5 deletions

View File

@ -89,12 +89,11 @@ isEmpty(BUILDS)|build_pass {
# Install tests unless no_testcase_installs is set, or there is already
# a `target' in INSTALLS.
#
# Tests are installed under a directory named after the target so that each
# test has its own directory for testdata etc.
# Tests are installed under a directory named after their source folder
# so that each test has its own directory for testdata etc.
#
load(resolve_target)
TARGET_BASENAME = $$basename(QMAKE_RESOLVED_TARGET)
target.path = $$[QT_INSTALL_TESTS]/$$TARGET_BASENAME
TEST_FOLDER = $$basename(_PRO_FILE_PWD_)
target.path = $$[QT_INSTALL_TESTS]/$$TEST_FOLDER
INSTALLS += target
}