diff options
| author | Kurt Korbatits <kurt.korbatits@nokia.com> | 2012-01-17 09:29:50 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-17 04:54:12 +0100 |
| commit | 5027368077252affe11ee839786298a68c537d5b (patch) | |
| tree | 463d852ac8b1ce1d1f43ebe26ec188a91a3b9fe3 /tests | |
| parent | bd0c7aa3158246ee6e594498259aac82eee22807 (diff) | |
Changed qclipboard unittest to work from installation directory.
- made test depend on copier and paster to make sure they are built first.
- Changed to use installTestHelperApp() to deploy helper apps.
Change-Id: I39e4f2ddcc3c735e17256db5638bf8a3495362f6
Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/gui/kernel/qclipboard/qclipboard.pro | 6 | ||||
| -rw-r--r-- | tests/auto/gui/kernel/qclipboard/test/test.pro | 11 |
2 files changed, 8 insertions, 9 deletions
diff --git a/tests/auto/gui/kernel/qclipboard/qclipboard.pro b/tests/auto/gui/kernel/qclipboard/qclipboard.pro index 692ca5dd3f..d97c58dea0 100644 --- a/tests/auto/gui/kernel/qclipboard/qclipboard.pro +++ b/tests/auto/gui/kernel/qclipboard/qclipboard.pro @@ -1,4 +1,4 @@ TEMPLATE = subdirs -SUBDIRS = test copier paster - - +SUBDIRS = copier paster +test.depends += $$SUBDIRS +SUBDIRS += test diff --git a/tests/auto/gui/kernel/qclipboard/test/test.pro b/tests/auto/gui/kernel/qclipboard/test/test.pro index 1c92fa4107..4be6769592 100644 --- a/tests/auto/gui/kernel/qclipboard/test/test.pro +++ b/tests/auto/gui/kernel/qclipboard/test/test.pro @@ -12,12 +12,11 @@ win32 { } wince* { - copier.files = ../copier/copier.exe - copier.path = copier - paster.files = ../paster/paster.exe - paster.path = paster - - DEPLOYMENT += copier paster rsc reg_resource + DEPLOYMENT += rsc reg_resource } mac: CONFIG += insignificant_test # QTBUG-23057 + +load(testcase) # for target.path and installTestHelperApp() +installTestHelperApp("../copier/copier",copier,copier) +installTestHelperApp("../paster/paster",paster,paster) |