From 467fdd578e6787497f2b702dca0cf38afdc0e6de Mon Sep 17 00:00:00 2001
From: Marco Alanen <denravonska@gmail.com>
Date: Fri, 1 Apr 2011 10:52:19 +0200
Subject: Fix bug when catching exceptions in tests.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Resets currentTestObject if an exception is caught while executing a
test suite. This is required or else subsequent test executions will
trigger an assert.

Task-number: QTBUG-3869
Merge-request: 1163
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
---
 src/testlib/qtestcase.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index 287d8e6..9a0d087 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -1865,6 +1865,8 @@ int QTest::qExec(QObject *testObject, int argc, char **argv)
              IOPMAssertionRelease(powerID);
          }
 #endif
+         currentTestObject = 0;
+
          // Rethrow exception to make debugging easier.
          throw;
          return 1;
-- 
cgit v0.12