From 5027368077252affe11ee839786298a68c537d5b Mon Sep 17 00:00:00 2001 From: Kurt Korbatits Date: Tue, 17 Jan 2012 09:29:50 +1000 Subject: [PATCH] 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 Reviewed-by: Rohan McGovern Reviewed-by: Jason McDonald --- tests/auto/gui/kernel/qclipboard/qclipboard.pro | 6 +++--- 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)