Mir

Merge lp:~thomas-voss/mir/disable_acceptance_integration_tests_on_armhf into lp:~mir-team/mir/trunk

  1. disable_acceptance_integration_tests_on_armhf
  2. Merge into trunk
Proposed by Thomas Voß
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: no longer in the source branch.
Merged at revision: 869
Proposed branch: lp:~thomas-voss/mir/disable_acceptance_integration_tests_on_armhf
Merge into: lp:~mir-team/mir/trunk
Diff against target: 55 lines (+19/-7)
3 files modified
debian/rules (+2/-1)
tests/CMakeLists.txt (+16/-3)
tests/integration-tests/CMakeLists.txt (+1/-3)
To merge this branch: bzr merge lp:~thomas-voss/mir/disable_acceptance_integration_tests_on_armhf
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Didier Roche-Tolomelli Approve
Review via email: mp+175746@code.launchpad.net

Commit message

Introduce cmake options to be able to selectively switch acceptance, integration and unit tests on/off.

Description of the change

Introduce cmake options to be able to selectively switch acceptance, integration and unit tests on/off.

To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

looks good! :)

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/rules'
2--- debian/rules 2013-07-12 18:34:11 +0000
3+++ debian/rules 2013-07-19 07:26:30 +0000
4@@ -22,7 +22,8 @@
5 dh_auto_configure -- \
6 $(COMMON_CONFIGURE_OPTIONS) \
7 -DMIR_PLATFORM=android \
8- -DMIR_DISABLE_INTEGRATION_TESTS=YES
9+ -DMIR_ENABLE_ACCEPTANCE_TESTS=NO \
10+ -DMIR_ENABLE_INTEGRATION_TESTS=NO
11 else
12 ifeq ($(DEB_HOST_ARCH),powerpc)
13 dh_auto_configure -- \
14
15=== modified file 'tests/CMakeLists.txt'
16--- tests/CMakeLists.txt 2013-07-05 09:59:18 +0000
17+++ tests/CMakeLists.txt 2013-07-19 07:26:30 +0000
18@@ -17,9 +17,22 @@
19 include_directories( ${LIBHARDWARE_INCLUDE_DIRS})
20 endif()
21
22-add_subdirectory(acceptance-tests/)
23-add_subdirectory(unit-tests/)
24-add_subdirectory(integration-tests/)
25+option(MIR_ENABLE_ACCEPTANCE_TESTS "Build & run acceptance tests" ON)
26+option(MIR_ENABLE_INTEGRATION_TESTS "Build & run integration tests" ON)
27+option(MIR_ENABLE_UNIT_TESTS "Build & run unit tests" ON)
28+
29+if (MIR_ENABLE_ACCEPTANCE_TESTS)
30+ add_subdirectory(acceptance-tests/)
31+endif (MIR_ENABLE_ACCEPTANCE_TESTS)
32+
33+if (MIR_ENABLE_UNIT_TESTS)
34+ add_subdirectory(unit-tests/)
35+endif (MIR_ENABLE_UNIT_TESTS)
36+
37+if (MIR_ENABLE_INTEGRATION_TESTS)
38+ add_subdirectory(integration-tests/)
39+endif (MIR_ENABLE_INTEGRATION_TESTS)
40+
41 add_subdirectory(mir_test/)
42 add_subdirectory(mir_test_framework/)
43 add_subdirectory(mir_test_doubles/)
44
45=== modified file 'tests/integration-tests/CMakeLists.txt'
46--- tests/integration-tests/CMakeLists.txt 2013-07-15 14:28:03 +0000
47+++ tests/integration-tests/CMakeLists.txt 2013-07-19 07:26:30 +0000
48@@ -61,6 +61,4 @@
49 ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
50 )
51
52-if (NOT MIR_DISABLE_INTEGRATION_TESTS)
53- mir_discover_tests(integration-tests)
54-endif()
55+mir_discover_tests(integration-tests)

Subscribers

People subscribed via source and target branches