← Back to branch summary

~townsend/unity/fix-waiting-to-install

« back to all changes in this revision

Viewing changes to tests/CMakeLists.txt

  • Committer: Chris Townsend
  • Date: 2013-07-17 16:24:40 UTC
  • mfrom: (3379.1.48 trunk)
  • Revision ID: christopher.townsend@canonical.com-20130717162440-zbeyzlbq0kdvnypo
Merge in trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/CMakeLists.txt
59
59
# Please keep actual test files alphabetically at top and then files
60
60
# from ../${UNITY_SRC} or ../../services in alphabetically after that
61
61
 
62
 
add_executable (test-unit
63
 
                unit/TestMain.cpp
64
 
                unit/TestPanelService.cpp
65
 
                unit/TestStaticCairoText.cpp
66
 
                ../services/panel-service.c
67
 
                )
68
 
target_link_libraries (test-unit unity-shared ${LIBS})
69
62
add_subdirectory (test-input-remover)
70
63
add_subdirectory (test-minimize-window-handler)
71
64
add_subdirectory (test-get-transients)
76
69
#
77
70
 
78
71
enable_testing()
79
 
# :(
80
 
find_library (GMOCK_LIB gmock)
81
 
find_library (GMOCK_MAIN_LIB gmock_main)
82
 
find_path(GTEST_SRC_DIR gtest.cc PATHS /usr/src/gtest/src)
 
72
set(GMOCK_LIB gmock)
 
73
set(GMOCK_MAIN_LIB gmock_main)
83
74
 
84
 
if (GTEST_SRC_DIR AND
85
 
    GMOCK_LIB AND
 
75
if (GMOCK_LIB AND
86
76
    GMOCK_MAIN_LIB)
87
77
 
88
78
  # MockWindowManager
94
84
 
95
85
# The service that provides DBus services to test against
96
86
  add_executable(test-gtest-service
97
 
                 mock-application.cpp
98
87
                 test_service_gdbus_wrapper.cpp
99
88
                 test_service_hud.cpp
100
89
                 test_service_main.cpp
133
122
      )
134
123
 
135
124
  add_executable(test-gtest-slow ${GTEST_SLOW_SOURCES})
136
 
 
137
125
  target_link_libraries(test-gtest-slow ${GTEST_SLOW_LIBS})
138
 
 
139
126
  add_test(UnityGTestSlow test-gtest-slow)
140
127
 
141
128
# The actual test executable (xless) - do not put anything that requires X in here
142
129
  set (GTEST_XLESS_SOURCES
143
130
       test_main_xless.cpp
144
131
       test_abstract_interface_generator.cpp
145
 
       test_launcher_model.cpp
 
132
       test_connection_manager.cpp
146
133
       test_glib_dbus_object.cpp
147
134
       test_glib_cancellable.cpp
148
135
       test_glib_object.cpp
164
151
       test_favorite_store_gsettings.cpp
165
152
       test_favorite_store_private.cpp
166
153
       test_launcher_entry_remote.cpp
 
154
       test_launcher_model.cpp
167
155
       test_launcher_options.cpp
168
156
       test_layout_system.cpp
169
157
       test_model_iterator.cpp
207
195
  endif ()
208
196
 
209
197
  add_executable(test-gtest-xless ${GTEST_XLESS_SOURCES})
210
 
 
211
198
  target_link_libraries(test-gtest-xless ${GTEST_XLESS_LIBS})
212
 
 
213
199
  add_test(UnityGTestXless test-gtest-xless)
214
200
 
215
201
# tests that require dbus, must not require X
237
223
# Tests that require X
238
224
  add_executable(test-gtest
239
225
                 mock-application.cpp
 
226
                 mock_results.cpp
240
227
                 logger_helper.cpp
241
228
                 test_main.cpp
242
229
                 test_action_link.cpp
273
260
                 test_launcher_tooltip.cpp
274
261
                 test_panel_indicators_view.cpp
275
262
                 test_panel_menu_view.cpp
 
263
                 test_panel_service.cpp
276
264
                 test_panel_style.cpp
277
265
                 test_panel_tray.cpp
278
266
                 test_panel_view.cpp
292
280
                 test_result_renderer.cpp
293
281
                 test_resultviewgrid.cpp
294
282
                 test_scope_bar.cpp
295
 
                 test_scopeview.cpp
 
283
                 test_scope_view.cpp
296
284
                 test_searchbar.cpp
297
285
                 test_session_button.cpp
298
286
                 test_session_controller.cpp
323
311
                 test_xdnd_start_stop_notifier_imp.cpp
324
312
                 ${UNITY_SRC}/UnityShowdesktopHandler.cpp
325
313
                 ${CMAKE_SOURCE_DIR}/plugins/unityshell/src/WindowMinimizeSpeedController.cpp
 
314
                 ${CMAKE_SOURCE_DIR}/services/panel-service.c
326
315
                )
327
316
 
328
317
  # Build plain C files separately so they don't try to include the
351
340
                        panel-lib)
352
341
  add_test(UnityGTest test-gtest)
353
342
endif (ENABLE_X_SUPPORT)
354
 
endif (GTEST_SRC_DIR AND
355
 
       GMOCK_LIB AND
 
343
endif (GMOCK_LIB AND
356
344
       GMOCK_MAIN_LIB)
357
345
 
358
346
if(ENABLE_X_SUPPORT)
365
353
set (TEST_RESULT_DIR ${CMAKE_BINARY_DIR}/tests)
366
354
set (TEST_RESULT_XML ${TEST_RESULT_DIR}/test-results.xml)
367
355
set (TEST_RESULT_HTML ${TEST_RESULT_DIR}/test-results.html)
 
356
set (DUMMY_DBUS_TEST_RUNNER ${CMAKE_CURRENT_SOURCE_DIR}/dummy-dbus-test-runner.sh)
 
357
set (DUMMY_XORG_TEST_RUNNER ${CMAKE_CURRENT_SOURCE_DIR}/dummy-xorg-test-runner.sh)
368
358
if (ENABLE_X_SUPPORT)
369
 
  set (GTEST_TEST_COMMAND ./test-gtest)
370
 
  set (GTEST_TEST_COMMAND_GESTURES ./test-gestures/test-gestures)
 
359
  set (GTEST_TEST_COMMAND ./test-gtest --gtest_output=xml:./test-gtest.xml)
 
360
  set (GTEST_TEST_COMMAND_GESTURES ./test-gestures/test-gestures --gtest_output=xml:./test-gestures.xml)
371
361
endif (ENABLE_X_SUPPORT)
372
 
set (GTEST_TEST_COMMAND_XLESS ./test-gtest-xless)
373
 
set (GTEST_TEST_COMMAND_SLOW ./test-gtest-slow)
374
 
set (GTEST_TEST_COMMAND_DBUS dbus-test-runner --task ./test-gtest-service --task ./test-gtest-dbus)
 
362
set (GTEST_TEST_COMMAND_XLESS ./test-gtest-xless --gtest_output=xml:./test-gtest-xless.xml)
 
363
set (GTEST_TEST_COMMAND_SLOW ./test-gtest-slow --gtest_output=xml:./test-gtest-slow.xml)
 
364
set (GTEST_TEST_COMMAND_DBUS ${DUMMY_DBUS_TEST_RUNNER} ./test-gtest-service ./test-gtest-dbus --gtest_output=xml:./test-gtest-dbus.xml)
 
365
 
 
366
set (TEST_COMMAND_XLESS
 
367
     ${GTEST_TEST_COMMAND_XLESS}
 
368
  && ${GTEST_TEST_COMMAND_GESTURES}
 
369
  && ${GTEST_TEST_COMMAND_DBUS} --gtest_filter=-TestScope*
 
370
  && echo "Warning, TestScope* DBus test cases are disabled!!")
375
371
 
376
372
set (TEST_COMMAND
377
 
     gtester --verbose -k -o=${TEST_RESULT_XML} ./test-unit
378
 
  && ${GTEST_TEST_COMMAND} --gtest_output=xml:./
379
 
  && ${GTEST_TEST_COMMAND_XLESS} --gtest_output=xml:./
380
 
  && ${GTEST_TEST_COMMAND_GESTURES} --gtest_output=xml:./
381
 
  && ${GTEST_TEST_COMMAND_DBUS} --gtest_output=xml:./
382
 
  && ${GTEST_TEST_COMMAND_SLOW} --gtest_output=xml:./
383
 
    )
 
373
     ${GTEST_TEST_COMMAND}
 
374
  && ${GTEST_TEST_COMMAND_SLOW}
 
375
  && ${TEST_COMMAND_XLESS})
384
376
 
385
377
set (TEST_COMMAND_HEADLESS
386
 
     ${GTEST_TEST_COMMAND_XLESS} --gtest_output=xml:./
387
 
  && ${GTEST_TEST_COMMAND_GESTURES} --gtest_output=xml:./
388
 
  #&& ${GTEST_TEST_COMMAND_DBUS} --gtest_output=xml:./
389
 
  && echo "Warning, DBus test cases are disabled!!")
 
378
     export NUX_FALLBACK_TEXTURE=TRUE
 
379
  && ${DUMMY_XORG_TEST_RUNNER} ${GTEST_TEST_COMMAND}
 
380
  && ${DUMMY_XORG_TEST_RUNNER} ${GTEST_TEST_COMMAND_SLOW}
 
381
  && ${TEST_COMMAND_XLESS})
390
382
 
391
 
if (GTEST_SRC_DIR)
 
383
if (GTEST_ROOT_DIR)
392
384
  if (ENABLE_X_SUPPORT)
393
 
    add_custom_target (check COMMAND  ${TEST_COMMAND} DEPENDS test-unit test-gtest test-gtest-slow test-gtest-xless test-gtest-dbus test-gestures)
394
 
    add_custom_target (check-headless COMMAND ${TEST_COMMAND_HEADLESS} DEPENDS test-gtest-xless test-gtest-dbus test-gestures)
 
385
    add_custom_target (check COMMAND  ${TEST_COMMAND} DEPENDS test-gtest test-gtest-slow test-gtest-xless test-gtest-dbus test-gestures)
 
386
    add_custom_target (check-headless COMMAND ${TEST_COMMAND_HEADLESS} DEPENDS test-gtest test-gtest-slow test-gtest-xless test-gtest-dbus test-gestures)
395
387
    add_custom_target (gcheck COMMAND  ${DBUS_TEST_COMMAND} DEPENDS test-gtest test-gtest-xless)
396
388
  else ()
397
 
    add_custom_target (check COMMAND  ${TEST_COMMAND} DEPENDS test-unit test-gtest-xless test-gtest-dbus)
398
 
    add_custom_target (check-headless COMMAND ${TEST_COMMAND_HEADLESS} DEPENDS test-gtest-xless test-gtest-dbus)
 
389
    add_custom_target (check COMMAND  ${TEST_COMMAND} DEPENDS test-gtest-xless test-gtest-dbus)
 
390
    add_custom_target (check-headless COMMAND ${TEST_COMMAND_XLESS} DEPENDS test-gtest-xless test-gtest-dbus)
399
391
    add_custom_target (gcheck COMMAND  ${DBUS_TEST_COMMAND} DEPENDS test-gtest-xless)
400
392
  endif ()
401
393
  add_custom_target (check-report COMMAND ${TEST_UNIT_COMMAND} && gtester-report ${TEST_RESULT_XML} > ${TEST_RESULT_HTML})
402
 
else (GTEST_SRC_DIR)
403
 
  add_custom_target (check COMMAND  ${TEST_COMMAND} DEPENDS test-unit)
404
 
endif (GTEST_SRC_DIR)
 
394
endif (GTEST_ROOT_DIR)
405
395
# make target to allow devs to run "make autopilot" from build dir:
406
396
set (AUTOPILOTDIR "${CMAKE_CURRENT_SOURCE_DIR}/autopilot")
407
397
# Rules to install autopilot files and executable script: