From 5e3f770ad5e47f296b4782c0b6c5b03162027500 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20Str=C3=B8mme?= <christian.stromme@qt.io>
Date: Thu, 18 Aug 2016 11:44:45 +0200
Subject: Fix problem with exception reporting in QFuture::waitForResult()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This fixes a problem that occurs when a task, that is run synchronously,
throws an exception. If that happened, then the exception would not be
re-thrown, because of an early return.

Task-number: QTBUG-54831
Change-Id: Ic70c5b810ec6adce6e62bfd6832ba9f170b13a7f
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
---
 .../qtconcurrentrun/tst_qtconcurrentrun.cpp        | 37 ++++++++++++++++++++++
 1 file changed, 37 insertions(+)

(limited to 'tests/auto')

diff --git a/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp b/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp
index 8ffe4d8dfe..7e057f3bcf 100644
--- a/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp
+++ b/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp
@@ -440,6 +440,19 @@ int throwFunctionReturn()
     return 0;
 }
 
+class SlowTask : public QRunnable
+{
+public:
+    static QAtomicInt cancel;
+    void run() Q_DECL_OVERRIDE {
+        int iter = 60;
+        while (--iter && !cancel.load())
+            QThread::currentThread()->msleep(25);
+    }
+};
+
+QAtomicInt SlowTask::cancel;
+
 void tst_QtConcurrentRun::exceptions()
 {
     QThreadPool pool;
@@ -480,6 +493,30 @@ void tst_QtConcurrentRun::exceptions()
     }
     if (!caught)
         QFAIL("did not get exception");
+
+    caught = false;
+    try  {
+        QtConcurrent::run(&pool, throwFunctionReturn).result();
+    } catch (QException &) {
+        caught = true;
+    }
+    QVERIFY2(caught, "did not get exception");
+
+    // Force the task to be run on this thread.
+    caught = false;
+    QThreadPool shortPool;
+    shortPool.setMaxThreadCount(1);
+    SlowTask *st = new SlowTask();
+    try  {
+        shortPool.start(st);
+        QtConcurrent::run(&shortPool, throwFunctionReturn).result();
+    } catch (QException &) {
+        caught = true;
+    }
+
+    SlowTask::cancel.store(true);
+
+    QVERIFY2(caught, "did not get exception");
 }
 #endif
 
-- 
cgit v1.2.3