From 3b0da64749b622454d904083815d67680ca9d7eb Mon Sep 17 00:00:00 2001 From: Skycoder42 Date: Wed, 20 Mar 2019 21:34:26 +0100 Subject: [PATCH] disable broken tests --- tests/auto/qml/qmlmvvmcore/qmlmvvmcore.pro | 1 + tests/auto/qml/qmlsettingsgenerator/qmlsettingsgenerator.pro | 1 + tests/auto/testrun.pri | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/tests/auto/qml/qmlmvvmcore/qmlmvvmcore.pro b/tests/auto/qml/qmlmvvmcore/qmlmvvmcore.pro index c4210d7..ec9a791 100644 --- a/tests/auto/qml/qmlmvvmcore/qmlmvvmcore.pro +++ b/tests/auto/qml/qmlmvvmcore/qmlmvvmcore.pro @@ -15,4 +15,5 @@ DISTFILES += \ importFiles.path = . DEPLOYMENT += importFiles +win32:msvc:CONFIG(debug, debug|release): CONFIG += disable_testrun include(../../testrun.pri) diff --git a/tests/auto/qml/qmlsettingsgenerator/qmlsettingsgenerator.pro b/tests/auto/qml/qmlsettingsgenerator/qmlsettingsgenerator.pro index 286925d..b660efb 100644 --- a/tests/auto/qml/qmlsettingsgenerator/qmlsettingsgenerator.pro +++ b/tests/auto/qml/qmlsettingsgenerator/qmlsettingsgenerator.pro @@ -24,4 +24,5 @@ DISTFILES += \ importFiles.path = . DEPLOYMENT += importFiles +win32:msvc:CONFIG(debug, debug|release): CONFIG += disable_testrun include(../../testrun.pri) diff --git a/tests/auto/testrun.pri b/tests/auto/testrun.pri index feb95f5..1ce4392 100644 --- a/tests/auto/testrun.pri +++ b/tests/auto/testrun.pri @@ -3,6 +3,10 @@ win32:!ReleaseBuild:!DebugBuild { runtarget.CONFIG = recursive runtarget.recurse_target = run-tests QMAKE_EXTRA_TARGETS += runtarget +} else:disable_testrun { + runtarget.target = run-tests + runtarget.depends += $(DESTDIR_TARGET) + QMAKE_EXTRA_TARGETS += runtarget } else { oneshell.target = .ONESHELL QMAKE_EXTRA_TARGETS += oneshell