From 8daaa2f6513b761502e676c24ab62d455bb97de7 Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@qt.io>
Date: Wed, 18 May 2016 07:33:52 +0200
Subject: [PATCH] Debugger: Restructure cleaning up after test

If the test case would result in a failing test it does not
execute further commands.
Ensure to close possible open editors even for failed test runs.

Change-Id: Ifcdcb76de5d10f649d38b84dad8999c6fd491ade
Reviewed-by: hjk <hjk@theqtcompany.com>
---
 src/plugins/debugger/debuggerplugin.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 7d54ac8b111..c44d53ba42e 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -163,6 +163,8 @@
 #include <cpptools/cpptoolstestcase.h>
 #include <cpptools/projectinfo.h>
 
+#include <utils/executeondestruction.h>
+
 #include <QTest>
 #include <QSignalSpy>
 #include <QTestEventLoop>
@@ -3675,6 +3677,9 @@ void DebuggerUnitTests::testStateMachine()
     ProjectExplorerPlugin::buildProject(SessionManager::startupProject());
     loop.exec();
 
+    ExecuteOnDestruction guard([] () {
+        EditorManager::closeAllEditors(false);
+    });
     DebuggerRunParameters rp;
     Target *t = SessionManager::startupProject()->activeTarget();
     QVERIFY(t);
@@ -3691,7 +3696,6 @@ void DebuggerUnitTests::testStateMachine()
     });
 
     QTestEventLoop::instance().enterLoop(5);
-    EditorManager::closeAllEditors(false);
 }