diff options
| -rw-r--r-- | tests/auto/selftests/exceptionthrow/exceptionthrow.pro (renamed from tests/auto/selftests/exception/exception.pro) | 4 | ||||
| -rw-r--r-- | tests/auto/selftests/exceptionthrow/tst_exceptionthrow.cpp (renamed from tests/auto/selftests/exception/tst_exception.cpp) | 2 | ||||
| -rw-r--r-- | tests/auto/selftests/expected_exceptionthrow.txt (renamed from tests/auto/selftests/expected_exception.txt) | 0 | ||||
| -rw-r--r-- | tests/auto/selftests/selftests.pro | 2 | ||||
| -rw-r--r-- | tests/auto/selftests/selftests.qrc | 2 | ||||
| -rw-r--r-- | tests/auto/selftests/tst_selftests.cpp | 8 |
6 files changed, 9 insertions, 9 deletions
diff --git a/tests/auto/selftests/exception/exception.pro b/tests/auto/selftests/exceptionthrow/exceptionthrow.pro index 65705c6..641818c 100644 --- a/tests/auto/selftests/exception/exception.pro +++ b/tests/auto/selftests/exceptionthrow/exceptionthrow.pro @@ -1,9 +1,9 @@ load(qttest_p4) -SOURCES += tst_exception.cpp +SOURCES += tst_exceptionthrow.cpp QT = core mac:CONFIG -= app_bundle CONFIG -= debug_and_release_target -TARGET = exception +TARGET = exceptionthrow diff --git a/tests/auto/selftests/exception/tst_exception.cpp b/tests/auto/selftests/exceptionthrow/tst_exceptionthrow.cpp index a54bfbe..7a65c2d 100644 --- a/tests/auto/selftests/exception/tst_exception.cpp +++ b/tests/auto/selftests/exceptionthrow/tst_exceptionthrow.cpp @@ -66,4 +66,4 @@ void tst_Exception::throwException() const QTEST_MAIN(tst_Exception) -#include "tst_exception.moc" +#include "tst_exceptionthrow.moc" diff --git a/tests/auto/selftests/expected_exception.txt b/tests/auto/selftests/expected_exceptionthrow.txt index 141ea8b..141ea8b 100644 --- a/tests/auto/selftests/expected_exception.txt +++ b/tests/auto/selftests/expected_exceptionthrow.txt diff --git a/tests/auto/selftests/selftests.pro b/tests/auto/selftests/selftests.pro index ca69afa..45de658 100644 --- a/tests/auto/selftests/selftests.pro +++ b/tests/auto/selftests/selftests.pro @@ -3,7 +3,7 @@ TEMPLATE = subdirs SUBDIRS = subtest test warnings maxwarnings cmptest globaldata skipglobal skip \ strcmp expectfail sleep fetchbogus crashes multiexec failinit failinitdata \ skipinit skipinitdata datetime singleskip assert waitwithoutgui differentexec \ - exception qexecstringlist datatable commandlinedata\ + exceptionthrow qexecstringlist datatable commandlinedata\ benchlibwalltime benchlibcallgrind benchlibeventcounter benchlibtickcounter \ benchliboptions xunit badxml diff --git a/tests/auto/selftests/selftests.qrc b/tests/auto/selftests/selftests.qrc index d57ff29..9dc9dd0 100644 --- a/tests/auto/selftests/selftests.qrc +++ b/tests/auto/selftests/selftests.qrc @@ -25,7 +25,7 @@ <file>expected_fatal.txt</file> <file>expected_waitwithoutgui.txt</file> <file>expected_differentexec.txt</file> - <file>expected_exception.txt</file> + <file>expected_exceptionthrow.txt</file> <file>expected_qexecstringlist.txt</file> <file>expected_datatable.txt</file> <file>expected_commandlinedata.txt</file> 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); |