}
contains(INSTALLS, target) {
- # Install testdata as well, but only if we're actually installing the test.
+ # Install testdata and helpers as well, but only if we're actually installing the test.
#
# Testdata is installed relative to the directory containing the testcase
# binary itself, e.g. this:
INSTALLS += $$tdi
}
-}
-
-} # have_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
+ # TEST_HELPER_INSTALLS specifies additional test helper executables for installation.
+ #
+ # Typical usage is:
+ #
+ # TEST_HELPER_INSTALLS += ../some/helper1 ../some/helper2
+ #
+ # Resulting in the test helpers being installed to:
+ #
+ # $$[QT_INSTALL_TESTS]/$$TARGET/some/helper1
+ # $$[QT_INSTALL_TESTS]/$$TARGET/some/helper2
+ #
win32: extension = .exe
- $$subTarget = $${2}/$${3}$${extension}
- $$subFiles = $${OUT_PWD}/$${1}$${extension}
- $$subPath = $${target.path}/$${2}
- $$subConfig += no_check_exist executable
- INSTALLS += $${subInstall}
- export(INSTALLS)
- export($$subTarget)
- export($$subFiles)
- export($$subPath)
- export($$subConfig)
+ for(test_helper, TEST_HELPER_INSTALLS) {
+ test_helper_dir = $$dirname(test_helper)
+ output = $$basename(test_helper_dir)
+ target = $$basename(test_helper)
+ targetName = $$replace(target, ' ', '_') # handle spaces in name
+ subTarget = $${targetName}.target
+ subInstall = $${targetName}_install
+ subConfig = $${subInstall}.CONFIG
+ subFiles = $${subInstall}.files
+ subPath = $${subInstall}.path
+ $$subTarget = $${output}/$${target}$${extension}
+ $$subFiles = $${OUT_PWD}/$${test_helper}$${extension}
+ $$subPath = $${target.path}/$${output}
+ $$subConfig += no_check_exist executable
+ INSTALLS += $${subInstall}
+ }
}
+} # have_target
+
QT = core testlib
SOURCES = ../tst_qlogging.cpp
-load(testcase) # for target.path and installTestHelperApp()
-installTestHelperApp("../app/app",app,app)
+TEST_HELPER_INSTALLS = ../app/app
win32:CONFIG += insignificant_test # QTBUG-25342 - sometimes hangs
mac:CONFIG += insignificant_test # QTBUG-25895 - sometimes hangs
-load(testcase) # for target.path and installTestHelperApp()
-for(file, SUBPROGRAMS): installTestHelperApp("../$${file}/$${file}",$${file},$${file})
-installTestHelperApp("../testProcessSpacesArgs/nospace",testProcessSpacesArgs,nospace)
-installTestHelperApp("../testProcessSpacesArgs/one space",testProcessSpacesArgs,"one space")
-installTestHelperApp("../testProcessSpacesArgs/two space s",testProcessSpacesArgs,"two space s")
-installTestHelperApp("../test Space In Name/testSpaceInName","test Space In Name",testSpaceInName)
+for(file, SUBPROGRAMS): TEST_HELPER_INSTALLS += "../$${file}/$${file}"
+TEST_HELPER_INSTALLS += \
+ ../testProcessSpacesArgs/nospace \
+ "../testProcessSpacesArgs/one space" \
+ "../testProcessSpacesArgs/two space s" \
+ "../test Space In Name/testSpaceInName"
QT = core-private network testlib
SOURCES = ../tst_qobject.cpp
-load(testcase) # for target.path and installTestHelperApp()
-installTestHelperApp("../signalbug/signalbug",signalbug,signalbug)
+TEST_HELPER_INSTALLS = ../signalbug/signalbug
QT = core testlib
SOURCES = ../tst_qthreadstorage.cpp
-load(testcase) # for installTestHelperApp()
-installTestHelperApp("../crashonexit/crashonexit",crashonexit,crashonexit)
+TEST_HELPER_INSTALLS = ../crashonexit/crashonexit
}
}
-load(testcase) # for target.path and installTestHelperApp()
-installTestHelperApp("../syslocaleapp/syslocaleapp",syslocaleapp,syslocaleapp)
+TEST_HELPER_INSTALLS = ../syslocaleapp/syslocaleapp
win32:CONFIG+= insignificant_test # QTBUG-25284
DEPLOYMENT += rsc reg_resource
}
-load(testcase) # for target.path and installTestHelperApp()
-installTestHelperApp("../copier/copier",copier,copier)
-installTestHelperApp("../paster/paster",paster,paster)
+TEST_HELPER_INSTALLS = \
+ ../copier/copier \
+ ../paster/paster
../index.html ../smb-file.txt
win32:CONFIG += insignificant_test # QTBUG-24226
-load(testcase) # for target.path and installTestHelperApp()
-installTestHelperApp("../echo/echo",echo,echo)
+
+TEST_HELPER_INSTALLS = ../echo/echo
DESTDIR = ..
}
-load(testcase) # for target.path and installTestHelperApp()
-installTestHelperApp("../lackey/lackey",lackey,lackey)
+TEST_HELPER_INSTALLS = ../lackey/lackey
RESOURCES += ../selftests.qrc
include(../selftests.pri)
-load(testcase) # for target.path and installTestHelperApp()
-for(file, SUBPROGRAMS): installTestHelperApp("../$${file}/$${file}",$${file},$${file})
+for(file, SUBPROGRAMS): TEST_HELPER_INSTALLS += "../$${file}/$${file}"
SUBPROGRAMS = desktopsettingsaware modal
win32: !wince*: SUBPROGRAMS += wincmdline
-load(testcase) # for target.path and installTestHelperApp()
-for(file, SUBPROGRAMS): installTestHelperApp("../$${file}/$${file}",$${file},$${file})
+for(file, SUBPROGRAMS): TEST_HELPER_INSTALLS += "../$${file}/$${file}"