diff options
author | Oliver Wolff <oliver.wolff@qt.io> | 2018-07-02 15:29:14 +0200 |
---|---|---|
committer | Oliver Wolff <oliver.wolff@qt.io> | 2018-07-25 05:17:41 +0000 |
commit | 64d63d036c8938b88fa47e8036f1ebe0279b75cf (patch) | |
tree | c6f9c34bc9b28d0a4d13bf9bf50ba7c027aa1edc /mkspecs | |
parent | 8d8a830f1377ad8838ac017d93a959d8bfef3aff (diff) |
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>
Diffstat (limited to 'mkspecs')
-rw-r--r-- | mkspecs/features/testcase.prf | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/mkspecs/features/testcase.prf b/mkspecs/features/testcase.prf index 9179470986..79883b7f09 100644 --- a/mkspecs/features/testcase.prf +++ b/mkspecs/features/testcase.prf @@ -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 } |