diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2014-02-25 10:25:23 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-14 22:39:58 +0100 |
| commit | 391c2c12abb66c6edcdac511be4ca126aeaf3377 (patch) | |
| tree | 18b2abebeb9825d0a0cd33c87fdae0d457fc7385 | |
| parent | 02abe7921bd84bccfe68a40923f00f48512f0d53 (diff) | |
Introduce GENERATED_TESTDATA variable and fix qresourceengine test.
testcase.prf cannot be loaded from pro file for various reasons,
see qtbase commit history for details.
Moved runtime testdata logic from pro file to testdata.prf, and
thus made is reusable in other test cases as well.
Change-Id: I500d08dc4951e4eda862071e4ddd3e0f6de8c3d2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| -rw-r--r-- | mkspecs/features/testcase.prf | 22 | ||||
| -rw-r--r-- | tests/auto/corelib/io/qresourceengine/qresourceengine.pro | 9 |
2 files changed, 23 insertions, 8 deletions
diff --git a/mkspecs/features/testcase.prf b/mkspecs/features/testcase.prf index 10f421a8e2..40ec7cff30 100644 --- a/mkspecs/features/testcase.prf +++ b/mkspecs/features/testcase.prf @@ -134,6 +134,28 @@ contains(INSTALLS, target) { INSTALLS += $$tdi } + # Install GENERATED_TESTDATA. + # Logic is copied from the TESTDATA installation, only difference being that + # INSTALL target is added with CONFIG = no_check_exist + for(file, GENERATED_TESTDATA) { + tnam = $$file + tnam ~= s,\\.\\.,dotdot, + tnam ~= s,[?*],wildcard, + tnam ~= s,[^A-Za-z0-9],_, + tdi = testdata_$$tnam + tdif = $${tdi}.files + tdip = $${tdi}.path + tdic = $${tdi}.CONFIG + + $$tdif = $$file + $$tdic = no_check_exist + + file = $$replace(file, ^(\\.\\./)+, ) + $$tdip = $${target.path}/$$dirname(file) + + INSTALLS += $$tdi + } + # TEST_HELPER_INSTALLS specifies additional test helper executables for installation. # # Typical usage is: diff --git a/tests/auto/corelib/io/qresourceengine/qresourceengine.pro b/tests/auto/corelib/io/qresourceengine/qresourceengine.pro index b9e17f7418..b7606eb3fc 100644 --- a/tests/auto/corelib/io/qresourceengine/qresourceengine.pro +++ b/tests/auto/corelib/io/qresourceengine/qresourceengine.pro @@ -14,12 +14,5 @@ PRE_TARGETDEPS += $${runtime_resource.target} TESTDATA += \ parentdir.txt \ testqrc/* - -# Special case needed for runtime_resource.rcc installation, -# since it does not exist at qmake runtime. -load(testcase) # to get value of target.path -runtime_resource_install.CONFIG = no_check_exist -runtime_resource_install.files = $$OUT_PWD/$${runtime_resource.target} -runtime_resource_install.path = $${target.path} -INSTALLS += runtime_resource_install +GENERATED_TESTDATA = $${runtime_resource.target} DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 |