whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

macOS: Don't build auto-tests as application bundles unless explicitly requested 

Consistent with other Unix platforms, and internally consistent between tests,
as a lot of tests were already applying CONFIG -= app_bundle manually.

Change-Id: Icd2b7e1c08015b26137af60ff82fddbc753f0ff4
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
bb10
Tor Arne Vestbø 2016-10-19 15:09:24 +02:00
parent 9cac65bc66
commit 7437ede145
24 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mkspecs/features/qt_build_config.prf
View File

@ -80,6 +80,8 @@ CONFIG += \
# resolved), nor functional (.res files end up in .prl files and break things).
unix: CONFIG += explicitlib
# By default we want tests on macOS to be built as standalone executables
macos: CONFIG += testcase_no_bundle
defineTest(qtBuildPart) {
bp = $$eval($$upper($$section(_QMAKE_CONF_, /, -2, -2))_BUILD_PARTS)

3
mkspecs/features/testcase.prf
View File

@ -6,6 +6,9 @@ have_target {
# qt_build_config tells us to re-enable exceptions here.
testcase_exceptions: CONFIG += exceptions
# Set in qt_build_config.prf
testcase_no_bundle: CONFIG -= app_bundle
benchmark: type = benchmark
else: type = check

1
tests/auto/corelib/global/qglobalstatic/qglobalstatic.pro
View File

@ -5,7 +5,6 @@ QT -= gui
TARGET = tst_qglobalstatic
CONFIG += console
CONFIG -= app_bundle
CONFIG += exceptions
SOURCES += tst_qglobalstatic.cpp

2
tests/auto/corelib/global/qlogging/test/test.pro
View File

@ -1,5 +1,5 @@
CONFIG += testcase
CONFIG -= app_bundle debug_and_release_target
CONFIG -= debug_and_release_target
qtConfig(c++11): CONFIG += c++11
qtConfig(c++14): CONFIG += c++14
TARGET = ../tst_qlogging

2
tests/auto/corelib/io/qfile/test/test.pro
View File

@ -1,5 +1,5 @@
CONFIG += testcase
CONFIG -= app_bundle debug_and_release_target
CONFIG -= debug_and_release_target
QT = core-private core testlib
qtHaveModule(network): QT += network
else: DEFINES += QT_NO_NETWORK

1
tests/auto/corelib/io/qlockfile/tst_qlockfile.pro
View File

@ -1,5 +1,4 @@
CONFIG += testcase
CONFIG -= app_bundle
TARGET = tst_qlockfile
SOURCES += tst_qlockfile.cpp

2
tests/auto/corelib/io/qprocess-noapplication/qprocess-noapplication.pro
View File

@ -1,4 +1,4 @@
CONFIG += testcase
CONFIG -= app_bundle debug_and_release_target
CONFIG -= debug_and_release_target
QT = core testlib
SOURCES = tst_qprocessnoapplication.cpp

2
tests/auto/corelib/io/qprocess/test/test.pro
View File

@ -1,5 +1,5 @@
CONFIG += testcase
CONFIG -= app_bundle debug_and_release_target
CONFIG -= debug_and_release_target
QT = core-private testlib network
SOURCES = ../tst_qprocess.cpp

1
tests/auto/corelib/json/json.pro
View File

@ -1,6 +1,5 @@
TARGET = tst_json
QT = core-private testlib
CONFIG -= app_bundle
CONFIG += testcase
!android:TESTDATA += bom.json test.json test.bjson test3.json test2.json

1
tests/auto/corelib/kernel/qmetamethod/qmetamethod.pro
View File

@ -2,4 +2,3 @@ CONFIG += testcase
TARGET = tst_qmetamethod
QT = core testlib
SOURCES = tst_qmetamethod.cpp
mac:CONFIG -= app_bundle

1
tests/auto/corelib/kernel/qmetaobjectbuilder/qmetaobjectbuilder.pro
View File

@ -2,4 +2,3 @@ CONFIG += testcase
TARGET = tst_qmetaobjectbuilder
QT = core-private testlib
SOURCES = tst_qmetaobjectbuilder.cpp
mac:CONFIG -= app_bundle

1
tests/auto/corelib/kernel/qsharedmemory/test/test.pro
View File

@ -2,7 +2,6 @@ CONFIG += testcase
QT = core-private testlib
mac:CONFIG -= app_bundle
linux:LIBS += -lrt
SOURCES += tst_qsharedmemory.cpp

1
tests/auto/corelib/kernel/qsystemsemaphore/test/test.pro
View File

@ -2,7 +2,6 @@ CONFIG += testcase
QT = core testlib
win32: CONFIG += console
mac:CONFIG -= app_bundle
SOURCES += tst_qsystemsemaphore.cpp
TARGET = tst_qsystemsemaphore

2
tests/auto/corelib/plugin/qfactoryloader/test/test.pro
View File

@ -17,8 +17,6 @@ win32 {
}
}
mac: CONFIG -= app_bundle
!qtConfig(library) {
LIBS += -L ../bin/ -lplugin1 -lplugin2
}

1
tests/auto/corelib/plugin/qlibrary/tst/tst.pro
View File

@ -1,5 +1,4 @@
CONFIG += testcase
CONFIG -= app_bundle
TARGET = ../tst_qlibrary
QT = core testlib
SOURCES = ../tst_qlibrary.cpp

1
tests/auto/corelib/plugin/qpluginloader/tst/tst.pro
View File

@ -4,7 +4,6 @@ QT = core testlib
qtConfig(private_tests): QT += core-private
SOURCES = ../tst_qpluginloader.cpp ../fakeplugin.cpp
HEADERS = ../theplugin/plugininterface.h
CONFIG -= app_bundle
win32 {
CONFIG(debug, debug|release) {

2
tests/auto/corelib/thread/qthreadstorage/test/test.pro
View File

@ -1,6 +1,6 @@
CONFIG += testcase
TARGET = ../tst_qthreadstorage
CONFIG -= app_bundle debug_and_release_target
CONFIG -= debug_and_release_target
CONFIG += console
QT = core testlib
SOURCES = ../tst_qthreadstorage.cpp

1
tests/auto/corelib/tools/qlocale/test/test.pro
View File

@ -1,5 +1,4 @@
CONFIG += console testcase
CONFIG -= app_bundle
QT = core testlib core-private
embedded: QT += gui
SOURCES = ../tst_qlocale.cpp

2
tests/auto/network/access/qnetworkreply/test/test.pro
View File

@ -1,6 +1,6 @@
CONFIG += testcase
testcase.timeout = 600 # this test is slow
CONFIG -= app_bundle debug_and_release_target
CONFIG -= debug_and_release_target
SOURCES += ../tst_qnetworkreply.cpp
TARGET = ../tst_qnetworkreply

1
tests/auto/network/kernel/qnetworkdatagram/qnetworkdatagram.pro
View File

@ -1,5 +1,4 @@
CONFIG += testcase console
CONFIG -= app_bundle
TARGET = tst_qnetworkdatagram
SOURCES += tst_qnetworkdatagram.cpp
QT = core network testlib

1
tests/auto/other/lancelot/lancelot.pro
View File

@ -1,5 +1,4 @@
CONFIG += testcase
CONFIG -= app_bundle
TARGET = tst_lancelot
QT += xml testlib

3
tests/auto/other/macplist/tst_macplist.cpp
View File

@ -155,9 +155,12 @@ void tst_MacPlist::test_plist()
QString infoPlist = QLatin1String("Info.plist");
QDir dir(QCoreApplication::applicationDirPath());
#ifndef Q_OS_MACOS
// macOS builds tests as single executables, iOS/tvOS/watchOS does not
QVERIFY(dir.cdUp());
QVERIFY(dir.cdUp());
QVERIFY(dir.cdUp());
#endif
QVERIFY(dir.cd(QLatin1String("app")));
QVERIFY(dir.cd(QLatin1String("app.app")));
QVERIFY(dir.cd(QLatin1String("Contents")));

2
tests/auto/widgets/kernel/qapplication/test/test.pro
View File

@ -1,5 +1,5 @@
CONFIG += testcase
CONFIG -= app_bundle debug_and_release_target
CONFIG -= debug_and_release_target
QT += widgets widgets-private testlib
QT += core-private gui-private

1
tests/auto/widgets/kernel/qwindowcontainer/qwindowcontainer.pro
View File

@ -1,5 +1,4 @@
CONFIG += testcase
mac:CONFIG -= app_bundle
TARGET = tst_qwindowcontainer
QT += widgets testlib
SOURCES += tst_qwindowcontainer.cpp