summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-04-15 07:35:13 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2011-04-15 07:48:01 (GMT)
commitee55dec1efe9c67518bf3e27f81b0696075f7153 (patch)
tree93f376d091a3630524259a9f91f0c1b096e412c4
parent59a6e6200984ccbb862b8758436a5e88b8c40bbc (diff)
downloadQt-ee55dec1efe9c67518bf3e27f81b0696075f7153.zip
Qt-ee55dec1efe9c67518bf3e27f81b0696075f7153.tar.gz
Qt-ee55dec1efe9c67518bf3e27f81b0696075f7153.tar.bz2
Make tst_exceptionsafety_objects part of the test set.
Re-enable this test, with the two test functions that fail on Linux disabled until the failures can be diagnosed. Change-Id: I915e1a0d675cb71a80086e89f9799a4f9f6b600c Reviewed-by: Rohan McGovern
-rw-r--r--tests/auto/exceptionsafety_objects/tst_exceptionsafety_objects.cpp2
-rw-r--r--tests/auto/other.pro2
2 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/exceptionsafety_objects/tst_exceptionsafety_objects.cpp b/tests/auto/exceptionsafety_objects/tst_exceptionsafety_objects.cpp
index e7e516e..3e4ccf5 100644
--- a/tests/auto/exceptionsafety_objects/tst_exceptionsafety_objects.cpp
+++ b/tests/auto/exceptionsafety_objects/tst_exceptionsafety_objects.cpp
@@ -352,6 +352,7 @@ void tst_ExceptionSafetyObjects::cleanupTestCase()
void tst_ExceptionSafetyObjects::objects()
{
+ QSKIP("This test currently crashes", SkipAll);
QFETCH(AbstractTester *, objectCreator);
doOOMTest(*objectCreator, 0);
@@ -457,6 +458,7 @@ void tst_ExceptionSafetyObjects::widgets_data()
void tst_ExceptionSafetyObjects::widgets()
{
+ QSKIP("This test currently crashes", SkipAll);
QFETCH(AbstractTester *, widgetCreator);
doOOMTest(*widgetCreator, 0, 00000);
diff --git a/tests/auto/other.pro b/tests/auto/other.pro
index 8819879..4d8ff4e 100644
--- a/tests/auto/other.pro
+++ b/tests/auto/other.pro
@@ -3,7 +3,7 @@
TEMPLATE=subdirs
SUBDIRS=\
-# exceptionsafety_objects \ shouldn't enable it
+ exceptionsafety_objects \
# baselineexample \ Just an example demonstrating qbaselinetest usage
lancelot \
qaccessibility \