U1DB Qt/ QML

Merge lp:~kalikiana/u1db-qt/makecheck into lp:u1db-qt

  1. makecheck
  2. Merge into trunk
Proposed by Cris Dywan
Status: Merged
Approved by: Cris Dywan
Approved revision: 82
Merged at revision: 82
Proposed branch: lp:~kalikiana/u1db-qt/makecheck
Merge into: lp:u1db-qt
Diff against target: 20 lines (+1/-1)
2 files modified
CMakeLists.txt (+1/-0)
tests/CMakeLists.txt (+0/-1)
To merge this branch: bzr merge lp:~kalikiana/u1db-qt/makecheck
Reviewer Review Type Date Requested Status
Cris Dywan Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+160574@code.launchpad.net

Commit message

Move enable_testing back to toplevel, otherwise it quietly does nothing

Description of the change

Move enable_testing back to toplevel, otherwise it quietly does nothing

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:82
http://91.189.93.125:8080/job/u1db-qt-ci/22/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/u1db-qt-quantal-amd64-ci/22
    SUCCESS: http://91.189.93.125:8080/job/u1db-qt-raring-amd64-ci/22

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/u1db-qt-ci/22/rebuild

review: Approve (continuous-integration)
Revision history for this message
Cris Dywan (kalikiana) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2013-04-23 10:39:54 +0000
3+++ CMakeLists.txt 2013-04-24 09:10:36 +0000
4@@ -19,6 +19,7 @@
5 add_definitions(-DQT_NO_KEYWORDS)
6
7 add_subdirectory(src)
8+enable_testing()
9 add_subdirectory(tests)
10 add_subdirectory(modules)
11 add_subdirectory(examples)
12
13=== modified file 'tests/CMakeLists.txt'
14--- tests/CMakeLists.txt 2013-04-23 11:16:30 +0000
15+++ tests/CMakeLists.txt 2013-04-24 09:10:36 +0000
16@@ -1,4 +1,3 @@
17-enable_testing()
18 add_custom_target(check COMMAND "env" "CTEST_OUTPUT_ON_FAILURE=1" "${CMAKE_CTEST_COMMAND}")
19
20 find_package(Qt5Test REQUIRED)

Subscribers

People subscribed via source and target branches

to all changes: