diff options
author | Rainer Keller <rainer.keller@theqtcompany.com> | 2015-02-27 15:53:27 +0100 |
---|---|---|
committer | Rainer Keller <rainer.keller@theqtcompany.com> | 2015-03-12 09:43:30 +0000 |
commit | c6f5cffcc09573ac196851f67f0be8d596c37c60 (patch) | |
tree | b08ec396408ab7f0b28f8f7a6430bda3933fa678 /src/testlib/qtestcase.cpp | |
parent | 10126b37d2e4655e17a2ea25b10801d8f9186f1c (diff) |
Testlib: Fix cleanupTestCase not called when last test blacklisted
Change-Id: I23810b4bd086c393325e56f7779fe7f7f01e76cf
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/testlib/qtestcase.cpp')
-rw-r--r-- | src/testlib/qtestcase.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index 6250be5853..222bdd3f39 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -2057,6 +2057,7 @@ static bool qInvokeTestMethod(const char *slotName, const char *data=0) /* For each entry in the data table, do: */ do { QTestResult::setSkipCurrentTest(false); + QTestResult::setBlacklistCurrentTest(false); if (!data || !qstrcmp(data, table.testData(curDataIndex)->dataTag())) { foundFunction = true; @@ -2088,6 +2089,7 @@ static bool qInvokeTestMethod(const char *slotName, const char *data=0) QTestResult::finishedCurrentTestFunction(); QTestResult::setSkipCurrentTest(false); + QTestResult::setBlacklistCurrentTest(false); QTestResult::setCurrentTestData(0); delete[] slot; @@ -2381,6 +2383,7 @@ static void qInvokeTestMethods(QObject *testObject) } QTestResult::setSkipCurrentTest(false); + QTestResult::setBlacklistCurrentTest(false); QTestResult::setCurrentTestFunction("cleanupTestCase"); invokeMethod(testObject, "cleanupTestCase()"); QTestResult::finishedCurrentTestData(); |