Move in tests directory

kmail/CMakeLists.txt

@@ -38,6 +38,7 @@ if (KDEPIM_BUILD_DESKTOP)
   add_subdirectory(avscripts)
   if(BUILD_TESTING)
      add_subdirectory(autotests)
+     add_subdirectory(tests)
   endif()
 endif()
 add_subdirectory(kcm_kpimidentities)

kmail/autotests/CMakeLists.txt

@@ -6,13 +6,6 @@ include_directories(
 )
 
 ########### dbus test ###############
-set(dbustest_SRCS dbustest.cpp)
-qt5_add_dbus_interfaces(dbustest_SRCS ${CMAKE_BINARY_DIR}/kmail/org.kde.kmail.kmail.xml)
-add_executable(dbustest ${dbustest_SRCS})
-add_dependencies(dbustest kmail_xml)
-target_link_libraries(dbustest KF5::KIOCore KF5::I18n Qt5::DBus)
-
-
 set( kmail_displaymenu_source displaymessageformatactionmenutest.cpp ../widgets/displaymessageformatactionmenu.cpp )
 add_executable( displaymessageformatactionmenutest ${kmail_displaymenu_source} )
 add_test( displaymessageformatactionmenutest displaymessageformatactionmenutest )

kmail/tests/CMakeLists.txt

+set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR})
+include_directories(
+  BEFORE
+  ${CMAKE_SOURCE_DIR}/kmail
+  ${CMAKE_BINARY_DIR}/kmail
+)
+
+########### dbus test ###############
+set(dbustest_SRCS dbustest.cpp)
+qt5_add_dbus_interfaces(dbustest_SRCS ${CMAKE_BINARY_DIR}/kmail/org.kde.kmail.kmail.xml)
+add_executable(dbustest ${dbustest_SRCS})
+add_dependencies(dbustest kmail_xml)
+target_link_libraries(dbustest KF5::KIOCore KF5::I18n Qt5::DBus)

kmail/autotests/dbustest.cpp → kmail/tests/dbustest.cpp

@@ -8,7 +8,6 @@
 #include <QCommandLineParser>
 
 #include "kmailinterface.h"
-//#include "aboutdata.h"
 
 int main(int argc, char **argv)
 {