Unity

Merge lp:~thomas-voss/unity/new-gmock into lp:unity

  1. new-gmock
  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: 3419
Proposed branch: lp:~thomas-voss/unity/new-gmock
Merge into: lp:unity
Diff against target: 158 lines (+46/-23)
4 files modified
CMakeLists.txt (+31/-9)
debian/control (+1/-1)
tests/CMakeLists.txt (+7/-11)
tests/test-gestures/CMakeLists.txt (+7/-2)
To merge this branch: bzr merge lp:~thomas-voss/unity/new-gmock
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Didier Roche-Tolomelli Approve
Review via email: mp+173450@code.launchpad.net

Commit message

Adjust CMake setup to account for new GMock version.

Description of the change

Adjust CMake setup to account for new GMock version.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3408
http://jenkins.qa.ubuntu.com/job/unity-ci/191/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/79/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/79/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/79/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/191/rebuild

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

FAILED: Continuous integration, rev:3409
http://jenkins.qa.ubuntu.com/job/unity-ci/200/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/89/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/88/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/88/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/200/rebuild

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

FAILED: Continuous integration, rev:3410
http://jenkins.qa.ubuntu.com/job/unity-ci/202/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/91/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/90/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/90/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/202/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

approved! Let's wait for nux now and we can merge all those :)

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

FAILED: Continuous integration, rev:3411
http://jenkins.qa.ubuntu.com/job/unity-ci/203/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/92/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/91/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/91/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/203/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

approving globally now that new gmock is available

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
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2013-07-03 16:13:29 +0000
+++ CMakeLists.txt 2013-07-09 11:47:26 +0000
@@ -270,9 +270,25 @@
270add_subdirectory(doc)270add_subdirectory(doc)
271271
272# Check for google test and build it locally272# Check for google test and build it locally
273set (
274 GMOCK_ROOT_DIR
275 "/usr/src/gmock"
276 CACHE
277 PATH
278 "Path to Google mock srcs"
279)
280
281set (
282 GMOCK_INCLUDE_DIR
283 "/usr/include/gmock/include"
284 CACHE
285 PATH
286 "Path to Google mock include"
287)
288
273set(289set(
274 GTEST_ROOT_DIR290 GTEST_ROOT_DIR
275 "/usr/src/gtest" # Default value, adjustable by user with e.g., ccmake291 "${GMOCK_ROOT_DIR}/gtest" # Default value, adjustable by user with e.g., ccmake
276 CACHE292 CACHE
277 PATH293 PATH
278 "Path to Google test srcs"294 "Path to Google test srcs"
@@ -280,20 +296,26 @@
280296
281set(297set(
282 GTEST_INCLUDE_DIR298 GTEST_INCLUDE_DIR
283 "/usr/include/gtest"299 "${GMOCK_ROOT_DIR}/gtest/include"
284 CACHE300 CACHE
285 PATH301 PATH
286 "Path to Google tests include"302 "Path to Google tests include"
287)303)
288304
289find_path(GTEST_INCLUDE_DIR gtest/gtest.h)305if (GTEST_INCLUDE_DIR AND GMOCK_INCLUDE_DIR)
290if (GTEST_INCLUDE_DIR)306 include_directories (
291 #FIXME - hardcoded is bad!307 ${GMOCK_INCLUDE_DIR}
308 ${GTEST_INCLUDE_DIR}
309 )
292 add_subdirectory(310 add_subdirectory(
293 ${GTEST_ROOT_DIR}311 ${GMOCK_ROOT_DIR}
294 gtest312 "${CMAKE_CURRENT_BINARY_DIR}/gmock"
295 )313 )
296endif(GTEST_INCLUDE_DIR)314elseif (GTEST_INCLUDE_DIR AND NOT GMOCK_INCLUDE_DIR)
315 include_directories (
316 ${GTEST_INCLUDE_DIR}
317 )
318endif(GTEST_INCLUDE_DIR AND GMOCK_INCLUDE_DIR)
297319
298add_subdirectory(services)320add_subdirectory(services)
299add_subdirectory(tests)321add_subdirectory(tests)
300322
=== modified file 'debian/control'
--- debian/control 2013-07-04 12:07:03 +0000
+++ debian/control 2013-07-09 11:47:26 +0000
@@ -47,7 +47,7 @@
47 libxi-dev (>= 2:1.7.1.901),47 libxi-dev (>= 2:1.7.1.901),
48 libxpathselect-dev (>=1.3),48 libxpathselect-dev (>=1.3),
49 libgtest-dev,49 libgtest-dev,
50 google-mock,50 google-mock (>= 1.6.0+svn437),
51Standards-Version: 3.9.351Standards-Version: 3.9.3
52Homepage: https://launchpad.net/unity52Homepage: https://launchpad.net/unity
53# If you aren't a member of ~unity-team but need to upload packaging changes,53# If you aren't a member of ~unity-team but need to upload packaging changes,
5454
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt 2013-07-02 01:11:30 +0000
+++ tests/CMakeLists.txt 2013-07-09 11:47:26 +0000
@@ -76,13 +76,10 @@
76#76#
7777
78enable_testing()78enable_testing()
79# :(79set(GMOCK_LIB gmock)
80find_library (GMOCK_LIB gmock)80set(GMOCK_MAIN_LIB gmock_main)
81find_library (GMOCK_MAIN_LIB gmock_main)
82find_path(GTEST_SRC_DIR gtest.cc PATHS /usr/src/gtest/src)
8381
84if (GTEST_SRC_DIR AND82if (GMOCK_LIB AND
85 GMOCK_LIB AND
86 GMOCK_MAIN_LIB)83 GMOCK_MAIN_LIB)
8784
88 # MockWindowManager85 # MockWindowManager
@@ -351,8 +348,7 @@
351 panel-lib)348 panel-lib)
352 add_test(UnityGTest test-gtest)349 add_test(UnityGTest test-gtest)
353endif (ENABLE_X_SUPPORT)350endif (ENABLE_X_SUPPORT)
354endif (GTEST_SRC_DIR AND351endif (GMOCK_LIB AND
355 GMOCK_LIB AND
356 GMOCK_MAIN_LIB)352 GMOCK_MAIN_LIB)
357353
358if(ENABLE_X_SUPPORT)354if(ENABLE_X_SUPPORT)
@@ -388,7 +384,7 @@
388 #&& ${GTEST_TEST_COMMAND_DBUS} --gtest_output=xml:./384 #&& ${GTEST_TEST_COMMAND_DBUS} --gtest_output=xml:./
389 && echo "Warning, DBus test cases are disabled!!")385 && echo "Warning, DBus test cases are disabled!!")
390386
391if (GTEST_SRC_DIR)387if (GTEST_ROOT_DIR)
392 if (ENABLE_X_SUPPORT)388 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)389 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)390 add_custom_target (check-headless COMMAND ${TEST_COMMAND_HEADLESS} DEPENDS test-gtest-xless test-gtest-dbus test-gestures)
@@ -399,9 +395,9 @@
399 add_custom_target (gcheck COMMAND ${DBUS_TEST_COMMAND} DEPENDS test-gtest-xless)395 add_custom_target (gcheck COMMAND ${DBUS_TEST_COMMAND} DEPENDS test-gtest-xless)
400 endif ()396 endif ()
401 add_custom_target (check-report COMMAND ${TEST_UNIT_COMMAND} && gtester-report ${TEST_RESULT_XML} > ${TEST_RESULT_HTML})397 add_custom_target (check-report COMMAND ${TEST_UNIT_COMMAND} && gtester-report ${TEST_RESULT_XML} > ${TEST_RESULT_HTML})
402else (GTEST_SRC_DIR)398else (GTEST_ROOT_DIR)
403 add_custom_target (check COMMAND ${TEST_COMMAND} DEPENDS test-unit)399 add_custom_target (check COMMAND ${TEST_COMMAND} DEPENDS test-unit)
404endif (GTEST_SRC_DIR)400endif (GTEST_ROOT_DIR)
405# make target to allow devs to run "make autopilot" from build dir:401# make target to allow devs to run "make autopilot" from build dir:
406set (AUTOPILOTDIR "${CMAKE_CURRENT_SOURCE_DIR}/autopilot")402set (AUTOPILOTDIR "${CMAKE_CURRENT_SOURCE_DIR}/autopilot")
407# Rules to install autopilot files and executable script:403# Rules to install autopilot files and executable script:
408404
=== modified file 'tests/test-gestures/CMakeLists.txt'
--- tests/test-gestures/CMakeLists.txt 2013-07-01 22:05:30 +0000
+++ tests/test-gestures/CMakeLists.txt 2013-07-09 11:47:26 +0000
@@ -1,4 +1,4 @@
1if (GTEST_SRC_DIR)1if (GTEST_ROOT_DIR)
2 set(UNITY_SRC ${CMAKE_SOURCE_DIR}/plugins/unityshell/src)2 set(UNITY_SRC ${CMAKE_SOURCE_DIR}/plugins/unityshell/src)
33
4 add_custom_command(OUTPUT CompoundGestureRecognizer.cpp4 add_custom_command(OUTPUT CompoundGestureRecognizer.cpp
@@ -33,6 +33,11 @@
33 remove_definitions(${CFLAGS})33 remove_definitions(${CFLAGS})
34 set_directory_properties(PROPERTY INCLUDE_DIRECTORIES "")34 set_directory_properties(PROPERTY INCLUDE_DIRECTORIES "")
3535
36 include_directories (
37 ${GMOCK_INCLUDE_DIR}
38 ${GTEST_INCLUDE_DIR}
39 )
40
36 include_directories (${CMAKE_SOURCE_DIR})41 include_directories (${CMAKE_SOURCE_DIR})
37 include_directories (${CMAKE_SOURCE_DIR}/unity-shared)42 include_directories (${CMAKE_SOURCE_DIR}/unity-shared)
3843
@@ -71,4 +76,4 @@
71 add_dependencies(test-gestures gtest unity-core-${UNITY_API_VERSION})76 add_dependencies(test-gestures gtest unity-core-${UNITY_API_VERSION})
7277
73 add_custom_target (check-gestures COMMAND ./test-gestures DEPENDS test-gestures)78 add_custom_target (check-gestures COMMAND ./test-gestures DEPENDS test-gestures)
74endif (GTEST_SRC_DIR)79endif (GTEST_ROOT_DIR)