From a40ebefcd382cb70676ed5883beace015c87f095 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Wed, 12 Oct 2011 14:51:09 +1000 Subject: [PATCH] Only build exceptionsafety_objects test if useful The test appears to be applicable only if building with g++, and even then the test is broken. Change-Id: I9eefb13325a10ec295a59c2bd1111e3c324ff94f Reviewed-by: Rohan McGovern --- .../tst_exceptionsafety_objects.cpp | 7 +++---- tests/auto/other.pro | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/auto/exceptionsafety_objects/tst_exceptionsafety_objects.cpp b/tests/auto/exceptionsafety_objects/tst_exceptionsafety_objects.cpp index e8acc6fcff..82289d9efd 100644 --- a/tests/auto/exceptionsafety_objects/tst_exceptionsafety_objects.cpp +++ b/tests/auto/exceptionsafety_objects/tst_exceptionsafety_objects.cpp @@ -48,10 +48,9 @@ QT_USE_NAMESPACE -// this test only works with -// * GLIBC -// * MSVC - only debug builds (we need the crtdbg.h helpers) -#if (defined(QT_NO_EXCEPTIONS) || (!defined(__GLIBC__) && !defined(Q_CC_MSVC))) && !defined(Q_MOC_RUN) +// this test only works with GLIBC + +#if defined(QT_NO_EXCEPTIONS) QTEST_NOOP_MAIN #else diff --git a/tests/auto/other.pro b/tests/auto/other.pro index 48170a26f2..17a92a2e01 100644 --- a/tests/auto/other.pro +++ b/tests/auto/other.pro @@ -42,7 +42,7 @@ wince*|!contains(QT_CONFIG, accessibility):SUBDIRS -= qaccessibility qdirectpainter \ qmultiscreen \ -win32-msvc*|wince*:SUBDIRS -= exceptionsafety_objects +!linux*-g++*:SUBDIRS -= exceptionsafety_objects # Following tests depends on private API !contains(QT_CONFIG, private_tests): SUBDIRS -= \