generic: fix tests after the build system cleanup

This commit is contained in:
Ivailo Monev 2015-09-06 09:38:29 +03:00
parent 8a3a63b05f
commit 59461bdfe6
20 changed files with 112 additions and 122 deletions

View file

@ -1,12 +1,12 @@
kde4_add_unit_test( backtraceparsertest fakebacktracegenerator.cpp backtraceparsertest.cpp)
target_link_libraries( backtraceparsertest ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} drkonqi_backtrace_parser)
kde4_add_test(drkonqi-backtraceparsertest fakebacktracegenerator.cpp backtraceparsertest.cpp)
target_link_libraries(drkonqi-backtraceparsertest ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} drkonqi_backtrace_parser)
add_executable(backtraceparsertest_manual TEST fakebacktracegenerator.cpp backtraceparsertest_manual.cpp)
kde4_add_manual_test(backtraceparsertest_manual fakebacktracegenerator.cpp backtraceparsertest_manual.cpp)
target_link_libraries(backtraceparsertest_manual drkonqi_backtrace_parser)
# create a link so that the data directory can be accessed from the build directory, where the test runs
if ( NOT ${CMAKE_CURRENT_BINARY_DIR} EQUAL ${CMAKE_CURRENT_SOURCE_DIR} )
add_custom_command(TARGET backtraceparsertest POST_BUILD
add_custom_command(TARGET drkonqi-backtraceparsertest POST_BUILD
COMMAND ${CMAKE_COMMAND} -E create_symlink
${CMAKE_CURRENT_SOURCE_DIR}/backtraceparsertest_data backtraceparsertest_data
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}

View file

@ -5,8 +5,7 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. )
########### next target ###############
set(testicons_SRCS testicons.cpp ${CMAKE_CURRENT_SOURCE_DIR}/../icons.cpp )
add_executable(testicons TEST ${testicons_SRCS})
kde4_add_manual_test(testicons ${testicons_SRCS})
target_link_libraries(testicons ${KDE4_KDEUI_LIBS})

View file

@ -1,30 +1,30 @@
set ( text_paint_LIB ${KDE4_PLASMA_LIBS} )
MACRO(KEYBOARD_DAEMON_UNIT_TESTS _testname)
kde4_add_unit_test(${_testname}_test TESTNAME kcm-keyboard-${_testname} NOGUI ${_testname}_test.cpp ../${_testname}.cpp)
target_link_libraries(${_testname}_test ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY} ${QT_QTTEST_LIBRARY} ${X11_Xkbfile_LIB} ${X11_LIBRARIES})
kde4_add_test(kcm-keyboard-${_testname} ${_testname}_test.cpp ../${_testname}.cpp)
target_link_libraries(kcm-keyboard-${_testname} ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY} ${QT_QTTEST_LIBRARY} ${X11_Xkbfile_LIB} ${X11_LIBRARIES})
ENDMACRO(KEYBOARD_DAEMON_UNIT_TESTS)
MACRO(KEYBOARD_DAEMON_UNIT_TESTS2 _testname _src1 _src2 _src3)
kde4_add_unit_test(${_testname}_test TESTNAME kcm-keyboard-${_testname} NOGUI ${_testname}_test.cpp ../${_testname}.cpp ../${_src1} ../${_src2} ../${_src3})
target_link_libraries(${_testname}_test ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY} ${QT_QTTEST_LIBRARY} ${X11_Xkbfile_LIB})
kde4_add_test(kcm-keyboard-${_testname} ${_testname}_test.cpp ../${_testname}.cpp ../${_src1} ../${_src2} ../${_src3})
target_link_libraries(kcm-keyboard-${_testname} ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY} ${QT_QTTEST_LIBRARY} ${X11_Xkbfile_LIB})
ENDMACRO(KEYBOARD_DAEMON_UNIT_TESTS2)
KEYBOARD_DAEMON_UNIT_TESTS(xkb_rules)
KEYBOARD_DAEMON_UNIT_TESTS(iso_codes)
kde4_add_unit_test(flags_test TESTNAME kcm-keyboard-flags_test NOGUI flags_test.cpp ../flags.cpp ../x11_helper.cpp ../keyboard_config.cpp ../xkb_rules.cpp)
target_link_libraries(flags_test ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY} ${QT_QTTEST_LIBRARY} ${X11_Xkbfile_LIB} ${X11_LIBRARIES} ${text_paint_LIB})
kde4_add_test(kcm-keyboard-flags_test flags_test.cpp ../flags.cpp ../x11_helper.cpp ../keyboard_config.cpp ../xkb_rules.cpp)
target_link_libraries(kcm-keyboard-flags_test ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY} ${QT_QTTEST_LIBRARY} ${X11_Xkbfile_LIB} ${X11_LIBRARIES} ${text_paint_LIB})
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config/base.1.1.xml ${CMAKE_CURRENT_BINARY_DIR}/config/base.1.1.xml COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config/base.bad.xml ${CMAKE_CURRENT_BINARY_DIR}/config/base.bad.xml COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config/base.xml ${CMAKE_CURRENT_BINARY_DIR}/config/base.xml COPYONLY)
if( X11_XTest_FOUND )
kde4_add_unit_test(keyboard_daemon_test TESTNAME kcm-keyboard-keyboard_daemon_test NOGUI keyboard_daemon_test.cpp ../keyboard_daemon.cpp ../layout_memory.cpp ../layout_memory_persister.cpp ../flags.cpp ../x11_helper.cpp ../xkb_helper.cpp ../xinput_helper.cpp ../layout_tray_icon.cpp ../keyboard_config.cpp ../xkb_rules.cpp ../keyboard_hardware.cpp ../bindings.cpp ../layouts_menu.cpp ../numlockx.c)
target_link_libraries(keyboard_daemon_test ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY} ${QT_QTTEST_LIBRARY} ${X11_Xkbfile_LIB} ${X11_XTest_LIB} ${X11_LIBRARIES} ${text_paint_LIB})
kde4_add_test(kcm-keyboard-keyboard_daemon_test keyboard_daemon_test.cpp ../keyboard_daemon.cpp ../layout_memory.cpp ../layout_memory_persister.cpp ../flags.cpp ../x11_helper.cpp ../xkb_helper.cpp ../xinput_helper.cpp ../layout_tray_icon.cpp ../keyboard_config.cpp ../xkb_rules.cpp ../keyboard_hardware.cpp ../bindings.cpp ../layouts_menu.cpp ../numlockx.c)
target_link_libraries(kcm-keyboard-keyboard_daemon_test ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY} ${QT_QTTEST_LIBRARY} ${X11_Xkbfile_LIB} ${X11_XTest_LIB} ${X11_LIBRARIES} ${text_paint_LIB})
if(XiGetDevicePresence_FOUND)
target_link_libraries(keyboard_daemon_test ${X11_Xinput_LIB})
target_link_libraries(kcm-keyboard-keyboard_daemon_test ${X11_Xinput_LIB})
endif(XiGetDevicePresence_FOUND)
endif( X11_XTest_FOUND )

View file

@ -1,3 +1,2 @@
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
kde4_add_unit_test(testkioarchive testkioarchive.cpp)
kde4_add_test(testkioarchive testkioarchive.cpp)
target_link_libraries(testkioarchive ${KDE4_KIO_LIBS} ${QT_QTTEST_LIBRARY})

View file

@ -4,7 +4,7 @@ set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
set(testdesktop_SRCS kio_desktop_test.cpp)
kde4_add_unit_test(testdesktop ${testdesktop_SRCS})
kde4_add_test(testdesktop ${testdesktop_SRCS})
target_link_libraries(testdesktop ${KDE4_KIO_LIBS} ${KDE4_SOLID_LIBS} ${QT_QTTEST_LIBRARY})

View file

@ -6,7 +6,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
set(testremote_SRCS testremote.cpp ${libkioremote_SRCS} )
add_executable(testremote TEST ${testremote_SRCS})
kde4_add_manual_test(testremote ${testremote_SRCS})
target_link_libraries(testremote ${KDE4_KIO_LIBS} )

View file

@ -1,5 +1,3 @@
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/.. )
########### next target ###############
@ -12,7 +10,7 @@ set(testtrash_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/../kinterprocesslock.cpp
)
kde4_add_unit_test(testtrash ${testtrash_SRCS})
kde4_add_test(testtrash ${testtrash_SRCS})
target_link_libraries(testtrash ${KDE4_KIO_LIBS} ${KDE4_SOLID_LIBS} ${QT_QTTEST_LIBRARY})
@ -20,6 +18,6 @@ target_link_libraries(testtrash ${KDE4_KIO_LIBS} ${KDE4_SOLID_LIBS} ${QT_QTTEST_
set(lockingtest_SRCS lockingtest.cpp ../kinterprocesslock.cpp )
add_executable(lockingtest NOGUI ${lockingtest_SRCS})
add_executable(lockingtest ${lockingtest_SRCS})
target_link_libraries(lockingtest ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY})

View file

@ -7,7 +7,7 @@ set(testsh_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/../curtaineffect.cpp
${CMAKE_CURRENT_SOURCE_DIR}/../fadeeffect.cpp)
add_executable(testsh TEST ${testsh_SRCS})
kde4_add_manual_test(testsh ${testsh_SRCS})
target_link_libraries(testsh ${KDE4_PLASMA_LIBS} kworkspace ${KDE4_KDEUI_LIBS}
${KDE4_SOLID_LIBRARY} ${QIMAGEBLITZ_LIBRARIES} ${X11_X11_LIB} ${KDECLARATIVE_LIBRARIES}

View file

@ -1,11 +1,14 @@
set( ksysguarddtest_SRCS ksysguarddtest.cpp ${CMAKE_SOURCE_DIR}/libs/ksysguard/ksgrd/SensorAgent.cpp ${CMAKE_SOURCE_DIR}/libs/ksysguard/ksgrd/SensorManager.cpp ${CMAKE_SOURCE_DIR}/libs/ksysguard/ksgrd/SensorSocketAgent.cpp ${CMAKE_SOURCE_DIR}/libs/ksysguard/ksgrd/SensorShellAgent.cpp)
kde4_add_unit_test( ksysguarddtest
TESTNAME ksysguard-ksysguarddtest
${ksysguarddtest_SRCS}
set( ksysguarddtest_SRCS
ksysguarddtest.cpp
${CMAKE_SOURCE_DIR}/libs/ksysguard/ksgrd/SensorAgent.cpp
${CMAKE_SOURCE_DIR}/libs/ksysguard/ksgrd/SensorManager.cpp
${CMAKE_SOURCE_DIR}/libs/ksysguard/ksgrd/SensorSocketAgent.cpp
${CMAKE_SOURCE_DIR}/libs/ksysguard/ksgrd/SensorShellAgent.cpp
)
target_link_libraries( ksysguarddtest
kde4_add_test(ksysguard-ksysguarddtest ${ksysguarddtest_SRCS})
target_link_libraries(ksysguard-ksysguarddtest
${KDE4_KDEUI_LIBS}
${QT_QTTEST_LIBRARY}
${QT_QTNETWORK_LIBRARY}

View file

@ -2,7 +2,7 @@
set(kuiservertest_SRCS kuiservertest.cpp)
add_executable(kuiservertest TEST ${kuiservertest_SRCS})
kde4_add_manual_test(kuiservertest ${kuiservertest_SRCS})
target_link_libraries(kuiservertest ${KDE4_KIO_LIBS})

View file

@ -1,8 +1,7 @@
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
set(kurifiltertest_SRCS kurifiltertest.cpp)
kde4_add_unit_test(kurifiltertest ${kurifiltertest_SRCS})
kde4_add_test(kurifiltertest ${kurifiltertest_SRCS})
target_link_libraries(kurifiltertest ${KDE4_KIO_LIBS} ${QT_QTTEST_LIBRARY})

View file

@ -2,10 +2,10 @@ add_definitions(-DTEST_DATA="\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\"")
set(testname testpamopen)
include_directories(${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR})
kde4_add_unit_test(${testname} kwalletexecuter.cpp ${testname}.cpp)
target_link_libraries(${testname} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${KDE4_KDECORE_LIBS})
kde4_add_test(kwalletd-${testname} kwalletexecuter.cpp ${testname}.cpp)
target_link_libraries(kwalletd-${testname} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${KDE4_KDECORE_LIBS})
set(testname testpamopennofile)
include_directories(${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR})
kde4_add_unit_test(${testname} kwalletexecuter.cpp ${testname}.cpp)
target_link_libraries(${testname} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${KDE4_KDECORE_LIBS})
kde4_add_test(kwalletd-${testname} kwalletexecuter.cpp ${testname}.cpp)
target_link_libraries(kwalletd-${testname} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${KDE4_KDECORE_LIBS})

View file

@ -1,5 +1,3 @@
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/..
${CMAKE_CURRENT_BINARY_DIR}/..
@ -11,7 +9,7 @@ include_directories(
set(backendtest_SRCS backendtest.cpp )
add_executable(backendtest TEST ${backendtest_SRCS})
kde4_add_manual_test(backendtest ${backendtest_SRCS})
target_link_libraries(backendtest ${KDE4_KDEUI_LIBS} kwalletbackend )
@ -21,7 +19,7 @@ target_link_libraries(backendtest ${KDE4_KDEUI_LIBS} kwalletbackend )
set(testbf_SRCS testbf.cpp )
add_executable(testbf TEST ${testbf_SRCS})
kde4_add_manual_test(testbf ${testbf_SRCS})
target_link_libraries(testbf ${KDE4_KDECORE_LIBS} kwalletbackend )
@ -31,7 +29,7 @@ target_link_libraries(testbf ${KDE4_KDECORE_LIBS} kwalletbackend )
set(testsha_SRCS testsha.cpp )
add_executable(testsha TEST ${testsha_SRCS})
kde4_add_manual_test(testsha ${testsha_SRCS})
target_link_libraries(testsha ${KDE4_KDECORE_LIBS} kwalletbackend )

View file

@ -7,8 +7,6 @@ include_directories(
set(kwalletwizardtest_SRCS
kwalletwizardtest.cpp
../kwalletwizard.cpp
)
kde4_add_ui_files(kwalletwizardtest_SRCS
../kbetterthankdialogbase.ui
../kwalletwizardpageexplanation.ui
../kwalletwizardpageintro.ui
@ -17,12 +15,7 @@ kde4_add_ui_files(kwalletwizardtest_SRCS
../kwalletwizardpagegpgkey.ui
)
if (QGPGME_FOUND)
kde4_add_ui_files(kwalletwizardtest_SRCS
../kwalletwizardpagepasswordgpg.ui)
endif(QGPGME_FOUND)
add_executable(kwalletwizardtest TEST ${kwalletwizardtest_SRCS})
kde4_add_manual_test(kwalletwizardtest ${kwalletwizardtest_SRCS})
target_link_libraries(kwalletwizardtest ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY})
if (QGPGME_FOUND)
target_link_libraries(kwalletwizardtest ${QGPGME_LIBRARIES})
@ -37,7 +30,7 @@ include_directories( ${KDE4_KDEUI_INCLUDES} ) # for kwallet.h
set(kwalletasync_SRCS kwalletasync.cpp kwallettest.cpp )
add_executable(kwalletasync TEST ${kwalletasync_SRCS})
kde4_add_manual_test(kwalletasync ${kwalletasync_SRCS})
target_link_libraries(kwalletasync ${KDE4_KDEUI_LIBS} )
@ -47,7 +40,7 @@ target_link_libraries(kwalletasync ${KDE4_KDEUI_LIBS} )
set(kwalletsync_SRCS kwalletsync.cpp )
add_executable(kwalletsync TEST ${kwalletsync_SRCS})
kde4_add_manual_test(kwalletsync ${kwalletsync_SRCS})
target_link_libraries(kwalletsync ${KDE4_KDEUI_LIBS} )
@ -57,7 +50,7 @@ target_link_libraries(kwalletsync ${KDE4_KDEUI_LIBS} )
set(kwalletpath_SRCS kwalletpath.cpp )
add_executable(kwalletpath TEST ${kwalletpath_SRCS})
kde4_add_manual_test(kwalletpath ${kwalletpath_SRCS})
target_link_libraries(kwalletpath ${KDE4_KDEUI_LIBS} )
@ -67,7 +60,7 @@ target_link_libraries(kwalletpath ${KDE4_KDEUI_LIBS} )
set(kwalletboth_SRCS kwalletboth.cpp kwallettest.cpp )
add_executable(kwalletboth TEST ${kwalletboth_SRCS})
kde4_add_manual_test(kwalletboth ${kwalletboth_SRCS})
target_link_libraries(kwalletboth ${KDE4_KDEUI_LIBS} )
@ -77,7 +70,7 @@ target_link_libraries(kwalletboth ${KDE4_KDEUI_LIBS} )
set(kwalletmany_SRCS kwalletmany.cpp)
add_executable(kwalletmany TEST ${kwalletmany_SRCS})
kde4_add_manual_test(kwalletmany ${kwalletmany_SRCS})
target_link_libraries(kwalletmany ${KDE4_KDEUI_LIBS} )
@ -87,7 +80,7 @@ target_link_libraries(kwalletmany ${KDE4_KDEUI_LIBS} )
set(kwalletautoclose_SRCS kwalletautoclose.cpp)
add_executable(kwalletautoclose TEST ${kwalletautoclose_SRCS})
kde4_add_manual_test(kwalletautoclose ${kwalletautoclose_SRCS})
target_link_libraries(kwalletautoclose ${KDE4_KDEUI_LIBS} )
@ -97,7 +90,7 @@ target_link_libraries(kwalletautoclose ${KDE4_KDEUI_LIBS} )
set(kwalletnoautoclose_SRCS kwalletnoautoclose.cpp)
add_executable(kwalletnoautoclose TEST ${kwalletnoautoclose_SRCS})
kde4_add_manual_test(kwalletnoautoclose ${kwalletnoautoclose_SRCS})
target_link_libraries(kwalletnoautoclose ${KDE4_KDEUI_LIBS} )

View file

@ -12,9 +12,9 @@ set( testTabBoxClientModel_SRCS
mock_tabboxclient.cpp
)
kde4_add_unit_test( testTabBoxClientModel TESTNAME kwin-testTabBoxClientModel ${testTabBoxClientModel_SRCS} )
kde4_add_test(kwin-testTabBoxClientModel ${testTabBoxClientModel_SRCS} )
target_link_libraries( testTabBoxClientModel ${KDE4_KDEUI_LIBS} ${QT_QTDECLARATIVE_LIBRARY} ${X11_LIBRARIES} ${QT_QTTEST_LIBRARY} )
target_link_libraries(kwin-testTabBoxClientModel ${KDE4_KDEUI_LIBS} ${QT_QTDECLARATIVE_LIBRARY} ${X11_LIBRARIES} ${QT_QTTEST_LIBRARY} )
########################################################
# Test TabBox::TabBoxHandler
@ -30,9 +30,16 @@ set( testTabBoxHandler_SRCS
mock_tabboxclient.cpp
)
kde4_add_unit_test( testTabBoxHandler TESTNAME kwin-testTabBoxHandler ${testTabBoxHandler_SRCS} )
kde4_add_test(kwin-testTabBoxHandler ${testTabBoxHandler_SRCS})
target_link_libraries( testTabBoxHandler ${KDE4_KDEUI_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} ${QT_QTTEST_LIBRARY} ${X11_LIBRARIES} )
target_link_libraries(kwin-testTabBoxHandler
${KDE4_KDEUI_LIBS}
${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY}
${QT_QTDECLARATIVE_LIBRARY}
${QT_QTTEST_LIBRARY}
${X11_LIBRARIES}
)
########################################################
# Test TabBox::TabBoxConfig
@ -42,8 +49,8 @@ set( testTabBoxConfig_SRCS
test_tabbox_config.cpp
)
kde4_add_unit_test( testTabBoxConfig TESTNAME kwin-testTabBoxConfig ${testTabBoxConfig_SRCS} )
target_link_libraries( testTabBoxConfig ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} )
kde4_add_test(kwin-testTabBoxConfig ${testTabBoxConfig_SRCS})
target_link_libraries(kwin-testTabBoxConfig ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY})
########################################################
@ -54,5 +61,5 @@ set( testDesktopChain_SRCS
test_desktopchain.cpp
)
kde4_add_unit_test( testDesktopChain TESTNAME kwin-testDesktopChain ${testDesktopChain_SRCS} )
target_link_libraries( testDesktopChain ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} )
kde4_add_test(kwin-testDesktopChain ${testDesktopChain_SRCS} )
target_link_libraries(kwin-testDesktopChain ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY})

View file

@ -2,17 +2,17 @@
# Test ScreenPaintData
########################################################
set( testScreenPaintData_SRCS test_screen_paint_data.cpp )
kde4_add_unit_test( testScreenPaintData TESTNAME kwin-TestScreenPaintData ${testScreenPaintData_SRCS} )
kde4_add_test(kwin-testScreenPaintData ${testScreenPaintData_SRCS} )
target_link_libraries( testScreenPaintData kwineffects ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} )
target_link_libraries(kwin-testScreenPaintData kwineffects ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} )
########################################################
# Test WindowPaintData
########################################################
set( testWindowPaintData_SRCS test_window_paint_data.cpp )
kde4_add_unit_test( testWindowPaintData TESTNAME kwin-TestWindowPaintData ${testWindowPaintData_SRCS} )
kde4_add_test(kwin-testWindowPaintData ${testWindowPaintData_SRCS})
target_link_libraries( testWindowPaintData kwineffects ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY} )
target_link_libraries(kwin-testWindowPaintData kwineffects ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTTEST_LIBRARY})
########################################################
# Test VirtualDesktopManager
@ -21,12 +21,12 @@ set( testVirtualDesktops_SRCS
test_virtual_desktops.cpp
../virtualdesktops.cpp
)
kde4_add_unit_test( testVirtualDesktops TESTNAME kwin-TestVirtualDesktops ${testVirtualDesktops_SRCS} )
kde4_add_test(kwin-testVirtualDesktops ${testVirtualDesktops_SRCS})
target_link_libraries( testVirtualDesktops
${KDE4_KDEUI_LIBS}
${QT_QTCORE_LIBRARY}
${QT_QTTEST_LIBRARY}
target_link_libraries(kwin-testVirtualDesktops
${KDE4_KDEUI_LIBS}
${QT_QTCORE_LIBRARY}
${QT_QTTEST_LIBRARY}
)
########################################################
@ -39,17 +39,17 @@ set( testClientMachine_SRCS
../atoms.cpp # needed by utils.cpp
../cursor.cpp # needed by utils.cpp
)
kde4_add_unit_test( testClientMachine TESTNAME kwin-TestClientMachine ${testClientMachine_SRCS} )
kde4_add_test(kwin-testClientMachine ${testClientMachine_SRCS})
target_link_libraries( testClientMachine
${QT_QTTEST_LIBRARY}
${QT_QTCORE_LIBRARY}
${KDE4_KDEUI_LIBS}
${XCB_XCB_LIBRARIES}
${XCB_XFIXES_LIBRARIES}
${X11_XCB_LIBRARIES}
${X11_X11_LIB} # to make jenkins happy
${X11_Xcursor_LIB}
target_link_libraries(kwin-testClientMachine
${QT_QTTEST_LIBRARY}
${QT_QTCORE_LIBRARY}
${KDE4_KDEUI_LIBS}
${XCB_XCB_LIBRARIES}
${XCB_XFIXES_LIBRARIES}
${X11_XCB_LIBRARIES}
${X11_X11_LIB} # to make jenkins happy
${X11_Xcursor_LIB}
)
########################################################
@ -58,14 +58,14 @@ target_link_libraries( testClientMachine
set( testXcbWrapper_SRCS
test_xcb_wrapper.cpp
)
kde4_add_unit_test( testXcbWrapper TESTNAME kwin-TestXcbWrapper ${testXcbWrapper_SRCS} )
kde4_add_test(kwin-testXcbWrapper ${testXcbWrapper_SRCS})
target_link_libraries( testXcbWrapper
${QT_QTTEST_LIBRARY}
${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY}
${XCB_XCB_LIBRARIES}
${X11_XCB_LIBRARIES}
target_link_libraries(kwin-testXcbWrapper
${QT_QTTEST_LIBRARY}
${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY}
${XCB_XCB_LIBRARIES}
${X11_XCB_LIBRARIES}
)
########################################################
@ -74,12 +74,12 @@ target_link_libraries( testXcbWrapper
set( testXcbWindow_SRCS
test_xcb_window.cpp
)
kde4_add_unit_test( testXcbWindow TESTNAME kwin-TestXcbWindow ${testXcbWindow_SRCS} )
kde4_add_test(kwin-testXcbWindow ${testXcbWindow_SRCS})
target_link_libraries( testXcbWindow
${QT_QTTEST_LIBRARY}
${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY}
${XCB_XCB_LIBRARIES}
${X11_XCB_LIBRARIES}
target_link_libraries(kwin-testXcbWindow
${QT_QTTEST_LIBRARY}
${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY}
${XCB_XCB_LIBRARIES}
${X11_XCB_LIBRARIES}
)

View file

@ -6,26 +6,26 @@ ${CMAKE_CURRENT_SOURCE_DIR}/../processui/ )
# Process unit test
kde4_add_unit_test(processtest TESTNAME ksysguard-processtest processtest.cpp)
target_link_libraries(processtest processui ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY})
kde4_add_test(ksysguard-processtest processtest.cpp)
target_link_libraries(ksysguard-processtest processui ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY})
# KSignalPlotter benchmark
set( signalplotterbenchmark_SRCS signalplotterbenchmark.cpp ../signalplotter/ksignalplotter.cpp)
kde4_add_unit_test( signalplotterbenchmark TESTNAME ksysguard-signalplottertest ${signalplotterbenchmark_SRCS} )
target_link_libraries( signalplotterbenchmark ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTBENCHMARK_LIBRARY} )
set(signalplotterbenchmark_SRCS signalplotterbenchmark.cpp ../signalplotter/ksignalplotter.cpp)
kde4_add_test(ksysguard-signalplotterbenchmark ${signalplotterbenchmark_SRCS})
target_link_libraries(ksysguard-signalplotterbenchmark ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTBENCHMARK_LIBRARY})
# KGraphicsSignalPlotter benchmark
set( graphicssignalplotterbenchmark_SRCS graphicssignalplotterbenchmark.cpp ../signalplotter/kgraphicssignalplotter.cpp)
kde4_add_unit_test( graphicssignalplotterbenchmark TESTNAME ksysguard-signalplottertest ${graphicssignalplotterbenchmark_SRCS} )
target_link_libraries( graphicssignalplotterbenchmark ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTBENCHMARK_LIBRARY} )
set(graphicssignalplotterbenchmark_SRCS graphicssignalplotterbenchmark.cpp ../signalplotter/kgraphicssignalplotter.cpp)
kde4_add_test(ksysguard-graphicssignalplotterbenchmark ${graphicssignalplotterbenchmark_SRCS})
target_link_libraries(ksysguard-graphicssignalplotterbenchmark ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTBENCHMARK_LIBRARY})
# KSignalPlotter unit test
set( signalplottertest_SRCS signalplottertest.cpp ../signalplotter/ksignalplotter.cpp)
kde4_add_unit_test( signalplottertest TESTNAME ksysguard-signalplottertest ${signalplottertest_SRCS} )
target_link_libraries( signalplottertest ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY} )
kde4_add_test(ksysguard-signalplottertest ${signalplottertest_SRCS} )
target_link_libraries(ksysguard-signalplottertest ${KDE4_KDEUI_LIBS} ${QT_QTTEST_LIBRARY})

View file

@ -1,30 +1,27 @@
INCLUDE_DIRECTORIES(
${corebindings_SOURCE_DIR}
)
)
kde4_add_unit_test(sortfiltermodeltest
kde4_add_test(sortfiltermodeltest
sortfiltermodeltest.cpp
${corebindings_SOURCE_DIR}/dataengineconsumer.cpp
${corebindings_SOURCE_DIR}/datamodel.cpp
${corebindings_SOURCE_DIR}/datasource.cpp
)
qt4_automoc(sortfiltermodeltest.cpp)
)
target_link_libraries(sortfiltermodeltest
${KDE4_PLASMA_LIBS}
${QT_QTGUI_LIBRARY}
${QT_QTTEST_LIBRARY}
)
)
set(runnermodeltest_SRCS
main.cpp
dynamictreemodel.cpp
modeltest.cpp
../runnermodel.cpp
)
)
qt4_automoc(${runnermodeltest_SRCS})
#add_library(datamodelsplugin SHARED ${datamodels_SRCS})
add_executable(runnermodeltest ${runnermodeltest_SRCS})
target_link_libraries(runnermodeltest ${QT_QTTEST_LIBRARY} ${KDE4_PLASMA_LIBS})

View file

@ -1,9 +1,9 @@
INCLUDE_DIRECTORIES(.. .)
kde4_add_unit_test(fullmodelaccesstest columnproxymodeltest.cpp ../columnproxymodel.cpp ../../core/tests/modeltest.cpp)
kde4_add_test(fullmodelaccesstest columnproxymodeltest.cpp ../columnproxymodel.cpp ../../core/tests/modeltest.cpp)
target_link_libraries(fullmodelaccesstest
${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY}
${QT_QTTEST_LIBRARY}
${KDE4_KDECORE_LIBS}
)
)

View file

@ -1,10 +1,7 @@
set(networkingservice_SRCS networkingservice.cpp)
kde4_add_ui_files(networkingservice_SRCS networkingserviceview.ui)
set(networkingservice_SRCS networkingservice.cpp networkingserviceview.ui)
qt4_add_dbus_interface(networkingservice_SRCS ../org.kde.Solid.Networking.Service.xml serviceinterface)
add_executable(networkingservice ${networkingservice_SRCS})
target_link_libraries(networkingservice ${KDE4_KIO_LIBS})