Move tests/autotest

8576a360 · Laurent Montel · f4e27a5c · 8576a360 · 8576a360 · 8576a360
Commit 8576a360 authored Jun 20, 2017 by Laurent Montel 😁
9 changed files
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -71,9 +71,5 @@ endif(BUILD_TESTING)

 add_subdirectory(src)
 add_subdirectory(kcm)
-if (BUILD_TESTING)
-    add_subdirectory(autotests)
-    add_subdirectory(tests)
-endif()

 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
--- a/src/akonadi-contacts/CMakeLists.txt
+++ b/src/akonadi-contacts/CMakeLists.txt
@@ -342,6 +342,11 @@ if (BUILD_TESTING)
    add_subdirectory(editor/widgets/autotests/)
 endif()

+if (BUILD_TESTING)
+    add_subdirectory(autotests)
+    add_subdirectory(tests)
+endif()
+

 add_subdirectory(editor/addresseditor/html)

--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
--- a/autotests/contactmetadataattributetest.cpp
+++ b/autotests/contactmetadataattributetest.cpp
--- a/autotests/contactmetadataattributetest.h
+++ b/autotests/contactmetadataattributetest.h
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
--- a/tests/emailaddressselectiondialogtest.cpp
+++ b/tests/emailaddressselectiondialogtest.cpp
--- a/tests/emailaddressselectionwidgettest.cpp
+++ b/tests/emailaddressselectionwidgettest.cpp
--- a/tests/emailaddressselectionwidgettest.h
+++ b/tests/emailaddressselectionwidgettest.h