[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=d7e9a42

The following commit has been merged in the master branch:
commit d7e9a42a7bfcbea1910fffb012cc49c15f9d5248
Author: Albert Vaca <albertvaka at gmail.com>
Date:   Sat Apr 12 23:04:35 2014 +0200

    Moved unit tests together
---
 kded/CMakeLists.txt                                | 1 -
 kded/autotests/CMakeLists.txt                      | 5 -----
 tests/CMakeLists.txt                               | 6 ++++++
 {kded/autotests => tests}/testsocketlinereader.cpp | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/kded/CMakeLists.txt b/kded/CMakeLists.txt
index ec1c968..e2dcb21 100644
--- a/kded/CMakeLists.txt
+++ b/kded/CMakeLists.txt
@@ -1,5 +1,4 @@
 add_subdirectory(plugins)
-add_subdirectory(autotests)
 
 find_package (QJSON 0.8.1 REQUIRED)
 find_package (QCA2 REQUIRED)
diff --git a/kded/autotests/CMakeLists.txt b/kded/autotests/CMakeLists.txt
deleted file mode 100644
index 1495c6a..0000000
--- a/kded/autotests/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-set(_testname testsocketlinereader)
-qt4_generate_moc(${_testname}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testname}.moc)
-include_directories(${QT_INCLUDES} ${KDE4_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR})
-kde4_add_unit_test(${_testname} ${_testname}.cpp ${_testname}.moc ../backends/lan/socketlinereader.cpp ../kdebugnamespace.cpp)
-target_link_libraries(${_testname} ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY})
\ No newline at end of file
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index b559abf..68a8872 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -27,3 +27,9 @@ set(kdeconnect_libraries
 kde4_add_unit_test(kdeconnect_tests ../kded/networkpackage.cpp ../kded/kdebugnamespace.cpp ../kded/filetransferjob.cpp networkpackagetests.cpp)
 target_link_libraries(kdeconnect_tests ${kdeconnect_libraries})
 
+#Socketlinereader
+set(_testname testsocketlinereader)
+qt4_generate_moc(${_testname}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testname}.moc)
+include_directories(${QT_INCLUDES} ${KDE4_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR})
+kde4_add_unit_test(${_testname} ${_testname}.cpp ${_testname}.moc ../kded/backends/lan/socketlinereader.cpp ../kded/kdebugnamespace.cpp)
+target_link_libraries(${_testname} ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY})
diff --git a/kded/autotests/testsocketlinereader.cpp b/tests/testsocketlinereader.cpp
similarity index 97%
rename from kded/autotests/testsocketlinereader.cpp
rename to tests/testsocketlinereader.cpp
index 5762504..c6a3aec 100644
--- a/kded/autotests/testsocketlinereader.cpp
+++ b/tests/testsocketlinereader.cpp
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA       *
  *************************************************************************************/
 
-#include "../backends/lan/socketlinereader.h"
+#include "../kded/backends/lan/socketlinereader.h"
 
 #include <QTest>
 #include <QTcpServer>

-- 
kdeconnect packaging