AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed selftests unittest to work from installation directory.

Browse Source 
- All subprograms installed as part of test instead of separate installs
- Added installTestHelperApp() to testcase.prf

Change-Id: I02fbbb299f095054c9216ad0e5f91f574fb0fe3d
Reviewed-by: Kurt Korbatits  <kurt.korbatits@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
This commit is contained in:
Kurt Korbatits 2012-01-10 10:38:51 +10:00 committed by Qt by Nokia
parent 008a1573af
commit 28bfa8f6cc
38 changed files with 40 additions and 177 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
mkspecs/features/testcase.prf
View File

@ -126,3 +126,28 @@ contains(INSTALLS, target) {
}
defineTest(installTestHelperApp) {
# args: relativeSource, relativeDestination, targetName
# description: install executables from other project directories as part of your installation.
# relativeSource - file to install including relative path
# relativeDestination - relative directory to install to
# targetName - executable without extension
targetName = $$replace(3, ' ', '_') # handle spaces in name
subTarget = $${targetName}.target
subInstall = $${targetName}_install
subConfig = $${subInstall}.CONFIG
subFiles = $${subInstall}.files
subPath = $${subInstall}.path
win32: extension = .exe
$$subTarget = $${2}/$${3}$${extension}
$$subFiles = $${1}$${extension}
$$subPath = $${target.path}/$${2}
$$subConfig += no_check_exist executable
INSTALLS += $${subInstall}
export(INSTALLS)
export($$subTarget)
export($$subFiles)
export($$subPath)
export($$subConfig)
}

5
tests/auto/testlib/selftests/assert/assert.pro
View File

@ -5,8 +5,3 @@ mac:CONFIG -= app_bundle
CONFIG -= debug_and_release_target
TARGET = assert
# This app is testdata for tst_selftests
target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
INSTALLS += target

5
tests/auto/testlib/selftests/badxml/badxml.pro
View File

@ -5,8 +5,3 @@ mac:CONFIG -= app_bundle
CONFIG -= debug_and_release_target
TARGET = badxml
# This app is testdata for tst_selftests
target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
INSTALLS += target

5
tests/auto/testlib/selftests/benchlibcallgrind/benchlibcallgrind.pro
View File

@ -5,8 +5,3 @@ mac:CONFIG -= app_bundle
CONFIG -= debug_and_release_target
TARGET = benchlibcallgrind
# This app is testdata for tst_selftests
target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
INSTALLS += target

5
tests/auto/testlib/selftests/benchlibeventcounter/benchlibeventcounter.pro
View File

@ -5,8 +5,3 @@ mac:CONFIG -= app_bundle
CONFIG -= debug_and_release_target
TARGET = benchlibeventcounter
# This app is testdata for tst_selftests
target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
INSTALLS += target

5
tests/auto/testlib/selftests/benchliboptions/benchliboptions.pro
View File

@ -5,8 +5,3 @@ mac:CONFIG -= app_bundle
CONFIG -= debug_and_release_target
TARGET = benchliboptions
# This app is testdata for tst_selftests
target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
INSTALLS += target

5
tests/auto/testlib/selftests/cmptest/cmptest.pro
View File

@ -5,8 +5,3 @@ mac:CONFIG -= app_bundle
CONFIG -= debug_and_release_target
TARGET = cmptest
# This app is testdata for tst_selftests
target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
INSTALLS += target

5
tests/auto/testlib/selftests/commandlinedata/commandlinedata.pro
View File

@ -5,8 +5,3 @@ mac:CONFIG -= app_bundle
CONFIG -= debug_and_release_target
TARGET = commandlinedata
# This app is testdata for tst_selftests
target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
INSTALLS += target

5
tests/auto/testlib/selftests/crashes/crashes.pro
View File

@ -5,8 +5,3 @@ mac:CONFIG -= app_bundle
CONFIG -= debug_and_release_target
TARGET = crashes
# This app is testdata for tst_selftests
target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
INSTALLS += target

5
tests/auto/testlib/selftests/datatable/datatable.pro
View File

@ -5,8 +5,3 @@ mac:CONFIG -= app_bundle
CONFIG -= debug_and_release_target
TARGET = datatable
# This app is testdata for tst_selftests
target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
INSTALLS += target

5
tests/auto/testlib/selftests/datetime/datetime.pro
View File

@ -5,8 +5,3 @@ mac:CONFIG -= app_bundle
CONFIG -= debug_and_release_target
TARGET = datetime
# This app is testdata for tst_selftests
target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
INSTALLS += target

5
tests/auto/testlib/selftests/differentexec/differentexec.pro
View File

@ -5,8 +5,3 @@ mac:CONFIG -= app_bundle
CONFIG -= debug_and_release_target
TARGET = differentexec
# This app is testdata for tst_selftests
target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
INSTALLS += target

5
tests/auto/testlib/selftests/exceptionthrow/exceptionthrow.pro
View File

@ -5,8 +5,3 @@ mac:CONFIG -= app_bundle
CONFIG -= debug_and_release_target
TARGET = exceptionthrow
# This app is testdata for tst_selftests
target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
INSTALLS += target

5
tests/auto/testlib/selftests/expectfail/expectfail.pro
View File

@ -5,8 +5,3 @@ mac:CONFIG -= app_bundle
CONFIG -= debug_and_release_target
TARGET = expectfail
# This app is testdata for tst_selftests
target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
INSTALLS += target

5
tests/auto/testlib/selftests/failinit/failinit.pro
View File

@ -5,8 +5,3 @@ mac:CONFIG -= app_bundle
CONFIG -= debug_and_release_target
TARGET = failinit
# This app is testdata for tst_selftests
target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
INSTALLS += target

5
tests/auto/testlib/selftests/failinitdata/failinitdata.pro
View File

@ -5,8 +5,3 @@ mac:CONFIG -= app_bundle
CONFIG -= debug_and_release_target
TARGET = failinitdata
# This app is testdata for tst_selftests
target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
INSTALLS += target

5
tests/auto/testlib/selftests/fetchbogus/fetchbogus.pro
View File

@ -5,8 +5,3 @@ mac:CONFIG -= app_bundle
CONFIG -= debug_and_release_target
TARGET = fetchbogus
# This app is testdata for tst_selftests
target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
INSTALLS += target

5
tests/auto/testlib/selftests/findtestdata/findtestdata.pro
View File

@ -7,8 +7,3 @@ CONFIG -= debug_and_release_target
RESOURCES = findtestdata.qrc
TARGET = findtestdata
# This app is testdata for tst_selftests
target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
INSTALLS += target

5
tests/auto/testlib/selftests/float/float.pro
View File

@ -5,8 +5,3 @@ mac:CONFIG -= app_bundle
CONFIG -= debug_and_release_target
TARGET = float
# This app is testdata for tst_selftests
target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
INSTALLS += target

5
tests/auto/testlib/selftests/globaldata/globaldata.pro
View File

@ -5,8 +5,3 @@ mac:CONFIG -= app_bundle
CONFIG -= debug_and_release_target
TARGET = globaldata
# This app is testdata for tst_selftests
target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
INSTALLS += target

5
tests/auto/testlib/selftests/longstring/longstring.pro
View File

@ -5,8 +5,3 @@ mac:CONFIG -= app_bundle
CONFIG -= debug_and_release_target
TARGET = longstring
# This app is testdata for tst_selftests
target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
INSTALLS += target

5
tests/auto/testlib/selftests/maxwarnings/maxwarnings.pro
View File

@ -5,8 +5,3 @@ mac:CONFIG -= app_bundle
CONFIG -= debug_and_release_target
TARGET = maxwarnings
# This app is testdata for tst_selftests
target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
INSTALLS += target

5
tests/auto/testlib/selftests/multiexec/multiexec.pro
View File

@ -5,8 +5,3 @@ mac:CONFIG -= app_bundle
CONFIG -= debug_and_release_target
TARGET = multiexec
# This app is testdata for tst_selftests
target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
INSTALLS += target

5
tests/auto/testlib/selftests/printdatatags/printdatatags.pro
View File

@ -5,8 +5,3 @@ mac:CONFIG -= app_bundle
CONFIG -= debug_and_release_target
TARGET = printdatatags
# This app is testdata for tst_selftests
target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
INSTALLS += target

5
tests/auto/testlib/selftests/printdatatagswithglobaltags/printdatatagswithglobaltags.pro
View File

@ -5,8 +5,3 @@ mac:CONFIG -= app_bundle
CONFIG -= debug_and_release_target
TARGET = printdatatagswithglobaltags
# This app is testdata for tst_selftests
target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
INSTALLS += target

5
tests/auto/testlib/selftests/qexecstringlist/qexecstringlist.pro
View File

@ -5,8 +5,3 @@ mac:CONFIG -= app_bundle
CONFIG -= debug_and_release_target
TARGET = qexecstringlist
# This app is testdata for tst_selftests
target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
INSTALLS += target

7
tests/auto/testlib/selftests/selftests.pri Normal file
View File

@ -0,0 +1,7 @@
SUBPROGRAMS = subtest warnings maxwarnings cmptest globaldata skip \
strcmp expectfail sleep fetchbogus crashes multiexec failinit failinitdata \
skipinit skipinitdata datetime singleskip assert differentexec \
exceptionthrow qexecstringlist datatable commandlinedata\
benchlibwalltime benchlibcallgrind benchlibeventcounter benchlibtickcounter \
benchliboptions xunit badxml longstring float printdatatags \
printdatatagswithglobaltags findtestdata

10
tests/auto/testlib/selftests/selftests.pro
View File

@ -1,12 +1,8 @@
TEMPLATE = subdirs
SUBDIRS = subtest test warnings maxwarnings cmptest globaldata skip \
strcmp expectfail sleep fetchbogus crashes multiexec failinit failinitdata \
skipinit skipinitdata datetime singleskip assert differentexec \
exceptionthrow qexecstringlist datatable commandlinedata\
benchlibwalltime benchlibcallgrind benchlibeventcounter benchlibtickcounter \
benchliboptions xunit badxml longstring float printdatatags \
printdatatagswithglobaltags findtestdata
include(selftests.pri)
SUBDIRS = $$SUBPROGRAMS test
INSTALLS =

5
tests/auto/testlib/selftests/singleskip/singleskip.pro
View File

@ -5,8 +5,3 @@ mac:CONFIG -= app_bundle
CONFIG -= debug_and_release_target
TARGET = singleskip
# This app is testdata for tst_selftests
target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
INSTALLS += target

5
tests/auto/testlib/selftests/skip/skip.pro
View File

@ -5,8 +5,3 @@ mac:CONFIG -= app_bundle
CONFIG -= debug_and_release_target
TARGET = skip
# This app is testdata for tst_selftests
target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
INSTALLS += target

5
tests/auto/testlib/selftests/skipinit/skipinit.pro
View File

@ -5,8 +5,3 @@ mac:CONFIG -= app_bundle
CONFIG -= debug_and_release_target
TARGET = skipinit
# This app is testdata for tst_selftests
target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
INSTALLS += target

5
tests/auto/testlib/selftests/skipinitdata/skipinitdata.pro
View File

@ -5,8 +5,3 @@ mac:CONFIG -= app_bundle
CONFIG -= debug_and_release_target
TARGET = skipinitdata
# This app is testdata for tst_selftests
target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
INSTALLS += target

5
tests/auto/testlib/selftests/sleep/sleep.pro
View File

@ -5,8 +5,3 @@ mac:CONFIG -= app_bundle
CONFIG -= debug_and_release_target
TARGET = sleep
# This app is testdata for tst_selftests
target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
INSTALLS += target

5
tests/auto/testlib/selftests/strcmp/strcmp.pro
View File

@ -5,8 +5,3 @@ mac:CONFIG -= app_bundle
CONFIG -= debug_and_release_target
TARGET = strcmp
# This app is testdata for tst_selftests
target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
INSTALLS += target

5
tests/auto/testlib/selftests/subtest/subtest.pro
View File

@ -5,8 +5,3 @@ mac:CONFIG -= app_bundle
CONFIG -= debug_and_release_target
TARGET = subtest
# This app is testdata for tst_selftests
target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
INSTALLS += target

5
tests/auto/testlib/selftests/test/test.pro
View File

@ -13,3 +13,8 @@ win32 {
}
RESOURCES += ../selftests.qrc
include(../selftests.pri)
load(testcase) # for target.path and installTestHelperApp()
for(file, SUBPROGRAMS): installTestHelperApp("../$${file}/$${file}",$${file},$${file})

5
tests/auto/testlib/selftests/warnings/warnings.pro
View File

@ -5,8 +5,3 @@ mac:CONFIG -= app_bundle
CONFIG -= debug_and_release_target
TARGET = warnings
# This app is testdata for tst_selftests
target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
INSTALLS += target

5
tests/auto/testlib/selftests/xunit/xunit.pro
View File

@ -6,8 +6,3 @@ mac:CONFIG -= app_bundle
CONFIG -= debug_and_release_target
TARGET = xunit
# This app is testdata for tst_selftests
target.path = $$[QT_INSTALL_TESTS]/tst_selftests/$$TARGET
INSTALLS += target