diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-07-15 03:27:45 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-07-15 03:30:34 (GMT) |
| commit | 454096217002f02379b4450e6e3d312f46c8cda9 (patch) | |
| tree | 0bdf890d56cd519fc7d3bcd6c2c6ebbb1771b4ab /tests/auto/selftests/tst_selftests.cpp | |
| parent | 6574b785813d9576e64af63ddfae55ec2b429fc2 (diff) | |
| download | Qt-454096217002f02379b4450e6e3d312f46c8cda9.zip Qt-454096217002f02379b4450e6e3d312f46c8cda9.tar.gz Qt-454096217002f02379b4450e6e3d312f46c8cda9.tar.bz2 | |
Fixed recompile of tests/auto/selftests/exception.
Turns out making a binary named `exception' is quite a bad idea...
when some code does `#include <exception>', guess which file gets
picked up :-)
Diffstat (limited to 'tests/auto/selftests/tst_selftests.cpp')
| -rw-r--r-- | tests/auto/selftests/tst_selftests.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/selftests/tst_selftests.cpp b/tests/auto/selftests/tst_selftests.cpp index de51f53..ba17ccb 100644 --- a/tests/auto/selftests/tst_selftests.cpp +++ b/tests/auto/selftests/tst_selftests.cpp @@ -170,7 +170,7 @@ void tst_Selftests::runSubTest_data() // with a warning that an uncaught exception was thrown. // This will time out and falsely fail, therefore we disable the test for that platform. # if !defined(Q_CC_INTEL) || !defined(Q_OS_WIN) - QTest::newRow("exception") << "exception" << QStringList(); + QTest::newRow("exceptionthrow") << "exceptionthrow" << QStringList(); # endif #endif QTest::newRow("qexecstringlist") << "qexecstringlist" << QStringList(); @@ -207,7 +207,7 @@ void tst_Selftests::doRunSubTest(QString &subdir, QStringList &arguments ) /* 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("exception") && subdir != QLatin1String("fetchbogus")) + if(subdir != QLatin1String("exceptionthrow") && subdir != QLatin1String("fetchbogus")) #endif if(subdir != QLatin1String("xunit")) QVERIFY2(err.isEmpty(), err.constData()); @@ -343,7 +343,7 @@ void tst_Selftests::checkXML() const * 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("exception") && subdir != QLatin1String("fetchbogus")) + if(subdir != QLatin1String("exceptionthrow") && subdir != QLatin1String("fetchbogus")) QVERIFY2(err.isEmpty(), err.constData()); QXmlStreamReader reader(out); @@ -385,7 +385,7 @@ void tst_Selftests::checkXunitxml() const * 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("exception") && subdir != QLatin1String("fetchbogus")) + if(subdir != QLatin1String("exceptionthrow") && subdir != QLatin1String("fetchbogus")) QVERIFY2(err.isEmpty(), err.constData()); QXmlStreamReader reader(out); |