aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@digia.com>2014-04-14 10:20:19 +0200
committerChristian Kandeler <christian.kandeler@digia.com>2014-04-14 10:53:49 +0200
commit97db021347f6de5025effcbab4519d8c5f304c91 (patch)
treed5f45d8575cb0e09a17a46e967a475e64d99fac4
parent0e6f9afb44ab7ede3985f1082de6943b75245443 (diff)
Make "infinite-loop" test app not actually run infinitely.v1.2.0
Otherwise, a failing test will leave a CPU-burning process behind. Change-Id: Ie9cb2e608f0cb3f1e1ad7491948666f8ac6fc87c Reviewed-by: Christian Stenger <christian.stenger@digia.com>
-rw-r--r--tests/auto/api/testdata/infinite-loop-process/infinite-loop.qbs1
-rw-r--r--tests/auto/api/testdata/infinite-loop-process/main.cpp5
2 files changed, 4 insertions, 2 deletions
diff --git a/tests/auto/api/testdata/infinite-loop-process/infinite-loop.qbs b/tests/auto/api/testdata/infinite-loop-process/infinite-loop.qbs
index 166f598dd..e2094576e 100644
--- a/tests/auto/api/testdata/infinite-loop-process/infinite-loop.qbs
+++ b/tests/auto/api/testdata/infinite-loop-process/infinite-loop.qbs
@@ -3,6 +3,7 @@ import qbs
Project {
CppApplication {
type: "application" // suppress bundle generation
+ Depends { name: "Qt.core" }
files: "main.cpp"
name: "infinite-loop"
}
diff --git a/tests/auto/api/testdata/infinite-loop-process/main.cpp b/tests/auto/api/testdata/infinite-loop-process/main.cpp
index 71b27a96b..26b4e3899 100644
--- a/tests/auto/api/testdata/infinite-loop-process/main.cpp
+++ b/tests/auto/api/testdata/infinite-loop-process/main.cpp
@@ -1,5 +1,6 @@
+#include <QThread>
+
int main()
{
- while (true)
- ;
+ QThread::sleep(60);
}