summaryrefslogtreecommitdiffstats
path: root/tests/auto/selftests
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2009-09-10 03:41:51 (GMT)
committerRohan McGovern <rohan.mcgovern@nokia.com>2009-09-10 03:44:46 (GMT)
commit66dc9221163a6b225cdfa351b8df7a01f6ce7bf0 (patch)
treebb8d09584b23adf16957a2b022f9dc5f1cb9eae7 /tests/auto/selftests
parent1931e4ad18c9547f53f2b454f330ba35871f9774 (diff)
downloadQt-66dc9221163a6b225cdfa351b8df7a01f6ce7bf0.zip
Qt-66dc9221163a6b225cdfa351b8df7a01f6ce7bf0.tar.gz
Qt-66dc9221163a6b225cdfa351b8df7a01f6ce7bf0.tar.bz2
Fixed tst_selftests failure.
It's acceptable for the exceptionthrow test to output: terminate called after throwing an instance of `int'
Diffstat (limited to 'tests/auto/selftests')
-rw-r--r--tests/auto/selftests/tst_selftests.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/selftests/tst_selftests.cpp b/tests/auto/selftests/tst_selftests.cpp
index 4599e8b..1a2de65 100644
--- a/tests/auto/selftests/tst_selftests.cpp
+++ b/tests/auto/selftests/tst_selftests.cpp
@@ -206,12 +206,12 @@ void tst_Selftests::doRunSubTest(QString &subdir, QStringList &arguments )
const QByteArray out(proc.readAllStandardOutput());
const QByteArray err(proc.readAllStandardError());
- /* Windows-MSVC decide to output an error message when exceptions are thrown,
- * so let's not check stderr for those. */
-#if defined(Q_OS_WIN)
- if(subdir != QLatin1String("exceptionthrow") && subdir != QLatin1String("fetchbogus"))
-#endif
- if(subdir != QLatin1String("xunit"))
+ /* Some platforms decides to output a message for uncaught exceptions. For instance,
+ * this is what windows platforms says:
+ * "This application has requested the Runtime to terminate it in an unusual way.
+ * Please contact the application's support team for more information." */
+ if(subdir != QLatin1String("exceptionthrow") && subdir != QLatin1String("fetchbogus")
+ && subdir != QLatin1String("xunit"))
QVERIFY2(err.isEmpty(), err.constData());
QList<QByteArray> res = splitLines(out);