diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-01-23 11:54:01 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-25 16:18:50 +0100 |
| commit | fa7034577b021e500d3bbba08145c1425bc63acf (patch) | |
| tree | a8faf83a2924af8fcdf09a76fa87cae43633e966 /tests | |
| parent | bbd4f4195f6efd78c8668839b0756b5a46ce5b09 (diff) | |
Revert "Re-enable mac tests"
This reverts commit cc811f77fc4f48fb696784f0a51042bb736d7071.
GUI tests were temporarily disabled on Mac in 8ed38c7 and cc811f7 meant
to re-enable them, but in fact removed the GUI tests on every platform.
There is still plenty of instability in the tests, so we will first
restore GUI tests on non-Mac platforms, and then we'll try to properly
re-enable them on Mac, step by step.
Change-Id: Ic8ac32386cc9e7c5ea3172751d74138e30fa0fdf
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/auto.pro | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 30bc175346..8809693647 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -8,6 +8,13 @@ SUBDIRS=\ qmldevtools.CONFIG = host_build +!mac { +SUBDIRS += \ + quick \ + particles \ + qmltest +} + installed_cmake.depends = cmake testcocoon: SUBDIRS -= headersclean |