[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdesupport/akonadi/server
From:       Volker Krause <vkrause () kde ! org>
Date:       2009-11-27 8:07:26
Message-ID: 1259309246.977433.15519.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1054922 by vkrause:

Merge unit test moving from the pe5.20091123 tag.


 M  +1 -2      src/CMakeLists.txt  
 M  +3 -1      src/interpreter.h  
 D             src/tests (directory)  
 M  +11 -5     tests/unittest/CMakeLists.txt  
 A             tests/unittest/interpretertest.cpp   \
tags/kdepim/pe5.20091123/kdesupport/akonadi/server/tests/unittest/interpretertest.cpp#1054882 \
[License: LGPL (v2+)]  A             tests/unittest/interpretertest.h   \
tags/kdepim/pe5.20091123/kdesupport/akonadi/server/tests/unittest/interpretertest.h#1054882 \
[License: LGPL (v2+)]  A             tests/unittest/querybuildertest.cpp   \
tags/kdepim/pe5.20091123/kdesupport/akonadi/server/tests/unittest/querybuildertest.cpp#1054882 \
[License: LGPL (v2+)]  A             tests/unittest/querybuildertest.h   \
tags/kdepim/pe5.20091123/kdesupport/akonadi/server/tests/unittest/querybuildertest.h#1054882 \
[License: LGPL (v2+)]


--- trunk/kdesupport/akonadi/server/src/CMakeLists.txt #1054921:1054922
@@ -1,2 +1 @@
-add_subdirectory( storage )
-add_subdirectory( tests )
+add_subdirectory( storage )
\ No newline at end of file
--- trunk/kdesupport/akonadi/server/src/interpreter.h #1054921:1054922
@@ -20,6 +20,8 @@
 #ifndef AKONADI_INTERPRETER_H
 #define AKONADI_INTERPRETER_H
 
+#include "akonadiprivate_export.h"
+
 #include <QtCore/QString>
 #include <QtCore/QStringList>
 
@@ -28,7 +30,7 @@
 /**
  * This class encapsulates solving nexted boolean constructs
  */
-class SearchInterpreterItem
+class AKONADIPRIVATE_EXPORT SearchInterpreterItem
 {
   public:
     enum Relation
--- trunk/kdesupport/akonadi/server/tests/unittest/CMakeLists.txt #1054921:1054922
@@ -1,16 +1,22 @@
 ########### next target ###############
+# QTEST_MAIN is using QApplication when QT_GUI_LIB is defined
+remove_definitions(-DQT_GUI_LIB)
+
 set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 
 include_directories( ${CMAKE_CURRENT_BINARY_DIR} \
${CMAKE_CURRENT_SOURCE_DIR}/../../src)  
-macro(add_server_test _source)
+macro(add_server_test _source _libs)
   set(_test ${_source})
   get_filename_component(_name ${_source} NAME_WE)
   automoc4_add_executable(${_name} ${_source})
   add_test(akonadi-${_name} ${_name})
-  target_link_libraries(${_name} akonadiprivate ${QT_QTTEST_LIBRARY})
+  target_link_libraries(${_name} ${_libs} ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} \
${QT_QTSQL_LIBRARY})  endmacro(add_server_test)
 
-add_server_test(imapstreamparsertest.cpp)
-add_server_test(scopetest.cpp)
-add_server_test(handlerhelpertest.cpp)
+add_server_test(imapstreamparsertest.cpp akonadiprivate)
+add_server_test(scopetest.cpp akonadiprivate)
+add_server_test(handlerhelpertest.cpp akonadiprivate)
+add_server_test(querybuildertest.cpp ${QT_QTSQL_LIBRARY})
+#interpreter.cpp is not currently included in the build...
+#add_server_test(interpretertest.cpp)


[prev in list] [next in list] [prev in thread] [next in thread]