← Back to branch summary

~mzanetti/unity8/panel-button-fixes

« back to all changes in this revision

Viewing changes to tests/CMakeLists.txt

  • Committer: CI Train Bot
  • Author(s): Albert Astals Cid, Michał Sawicz
  • Date: 2015-09-22 12:57:02 UTC
  • mfrom: (1752.8.47 origin/autopkgtests)
  • Revision ID: ci-train-bot@canonical.com-20150922125702-wboqbqanpto9l9s2
Add DEP-8 test for all our UI and unit tests

Some refactoring was needed:
- added a basic Ubuntu.Web mock
- made plugin path an environment, not a compiled-in bit
- moved Unity.Application resources into .qrc

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/CMakeLists.txt
22
22
add_executable(qmlscene ALIAS uqmlscene)
23
23
import_executables(dbus-test-runner)
24
24
 
 
25
set(UNITY_PLUGINPATH "${CMAKE_BINARY_DIR}/plugins" CACHE PATH "Path to pre-built unity8 plugin dir.")
 
26
set(UNITY_MOCKPATH "${CMAKE_BINARY_DIR}/tests/mocks" CACHE PATH "Path to pre-built unity8 mock dir.")
 
27
 
 
28
# Pre-built mocks have preference, pre-built plugins replace local build
25
29
set(UNITY_IMPORT_PATHS
 
30
    ${UNITY_MOCKPATH}
26
31
    ${CMAKE_BINARY_DIR}/tests/mocks
27
32
    ${CMAKE_BINARY_DIR}/tests/utils/modules
28
 
    ${CMAKE_BINARY_DIR}/plugins
 
33
    ${UNITY_PLUGINPATH}
29
34
)
 
35
list(REMOVE_DUPLICATES UNITY_IMPORT_PATHS)
30
36
set(UNITY_IMPORT_PATHS ${UNITY_IMPORT_PATHS} CACHE INTERNAL "")
31
37
 
32
38
macro(unity8_parse_arguments)
40
46
    set(ld_paths)
41
47
    if(U8TEST_LIGHTDM)
42
48
        list(APPEND ld_paths
43
 
            ${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics
44
 
            ${CMAKE_BINARY_DIR}/tests/mocks/IntegratedLightDM/liblightdm
 
49
            ${UNITY_MOCKPATH}/libusermetrics
 
50
            ${UNITY_MOCKPATH}/IntegratedLightDM/liblightdm
45
51
        )
46
52
    endif()
47
53