← Back to branch summary

~pete-woods/indicator-network/cmake-extras-compatibility

« back to all changes in this revision

Viewing changes to tests/integration/CMakeLists.txt

  • Committer: Bileto Bot
  • Author(s): Pete Woods
  • Date: 2016-11-09 10:03:46 UTC
  • mfrom: (641.1.6 stable)
  • Revision ID: ci-train-bot@canonical.com-20161109100346-plycppqa6csz7okp
Try again to make the tests more reliable (LP: #1632275)

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/integration/CMakeLists.txt
1
1
 
2
 
add_definitions(-DNETWORK_SERVICE_BIN="${CMAKE_BINARY_DIR}/src/indicator/indicator-network-service")
 
2
set(INDICATOR_NETWORK_TESTING_GSETTINGS_SCHEMA_DIR "${CMAKE_BINARY_DIR}/data") #need this somewhere higher up in the hierarchy
 
3
#set(INDICATOR_NETWORK_UNDER_TESTING 1)
 
4
#set(INDICATOR_NETWORK_TESTING_GSETTINGS_INI=${CMAKE_BINARY_DIR}/data/test_gsettings.ini)
 
5
#set(GSETTINGS_SCHEMA_DIR="${INDICATOR_NETWORK_TESTING_GSETTINGS_SCHEMA_DIR}")
 
6
 
 
7
add_definitions(
 
8
    -DNETWORK_SERVICE_BIN="${CMAKE_BINARY_DIR}/src/indicator/indicator-network-service"
 
9
    -DINDICATOR_NETWORK_TESTING_GSETTINGS_SCHEMA_DIR="${INDICATOR_NETWORK_TESTING_GSETTINGS_SCHEMA_DIR}"
 
10
    -DINDICATOR_NETWORK_TESTING_GSETTINGS_INI="${CMAKE_BINARY_DIR}/data/test_gsettings.ini"
 
11
)
3
12
 
4
13
include_directories(
5
14
    "${CMAKE_SOURCE_DIR}/src/connectivity-api/connectivity-qt"
45
54
    integration-tests
46
55
)
47
56
 
48
 
set(INDICATOR_NETWORK_TESTING_GSETTINGS_SCHEMA_DIR ${CMAKE_BINARY_DIR}/data) #need this somewhere higher up in the hierarchy
49
 
 
50
 
set(TEST_ENV_VARS
51
 
    INDICATOR_NETWORK_UNDER_TESTING=1
52
 
    INDICATOR_NETWOR_TESTING_GSETTINGS_INI=${CMAKE_BINARY_DIR}/data/test_gsettings.ini
53
 
    GSETTINGS_SCHEMA_DIR=${INDICATOR_NETWORK_TESTING_GSETTINGS_SCHEMA_DIR}
54
 
)
55
 
set_tests_properties(
56
 
    integration-tests
57
 
    PROPERTIES
58
 
    ENVIRONMENT "${TEST_ENV_VARS}"
59
 
)
60
57
 
61
58
add_custom_command(OUTPUT ${INDICATOR_NETWORK_TESTING_GSETTINGS_SCHEMA_DIR}/gschemas.compiled
62
59
                   COMMAND glib-compile-schemas --targetdir=${INDICATOR_NETWORK_TESTING_GSETTINGS_SCHEMA_DIR} --strict ${CMAKE_SOURCE_DIR}/data