summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-04-18 17:21:03 +1000
committerRohan McGovern <rohan.mcgovern@nokia.com>2011-05-18 10:46:40 +1000
commit22d6cd5cdd7c1f64de60b1761521fbaa3c05ff1b (patch)
treea0bf41dcd2a0ca2591cde3f53bb86a5fe4065b5d /tests
parent667a40fe36c989d20a880f7d10512a46db8b9c9a (diff)
Don't try to run exceptionsafety_objects test by default on windows.
This test relies on some API specific to MSVC's debug runtime, which is not always guaranteed to be available. Change-Id: Ib0ae4694ad51f59198dadfce802f0dfdf0522002 Reviewed-by: Rohan McGovern (cherry picked from commit 01dfb9ca25bfaec5784f404dcd4bf41bbc2b6fcb)
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/other.pro3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/auto/other.pro b/tests/auto/other.pro
index 2a24cb5e70..0b49d29cc4 100644
--- a/tests/auto/other.pro
+++ b/tests/auto/other.pro
@@ -3,7 +3,6 @@
TEMPLATE=subdirs
SUBDIRS=\
- exceptionsafety_objects \
# baselineexample \ Just an example demonstrating qbaselinetest usage
lancelot \
qaccessibility \
@@ -56,6 +55,8 @@ symbian {
qs60mainapplication
}
+!win32-msvc*:!wince*:SUBDIRS += exceptionsafety_objects
+
# Following tests depends on private API
!contains(QT_CONFIG, private_tests): SUBDIRS -= \
qcombobox \