From fa7034577b021e500d3bbba08145c1425bc63acf Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Thu, 23 Jan 2014 11:54:01 +0200 Subject: [PATCH] Revert "Re-enable mac tests" MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Lars Knoll --- tests/auto/auto.pro | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 30bc175..8809693 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 -- 2.7.4