Merge lp:~compiz-team/compiz/build-fixes-part-8-gtest-add-tests into lp:~compiz/compiz/ubuntu

Proposed by Sam Spilsbury on 2012-05-20
Status: Superseded
Proposed branch: lp:~compiz-team/compiz/build-fixes-part-8-gtest-add-tests
Merge into: lp:~compiz/compiz/ubuntu
Prerequisite: lp:~compiz-team/compiz/build-fixes-part-7-libcompizconfig-backend-env
Diff against target: 9 lines (+1/-1)
1 file modified
src/wrapsystem/tests/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~compiz-team/compiz/build-fixes-part-8-gtest-add-tests
Reviewer Review Type Date Requested Status
compiz packagers 2012-05-20 Pending
Review via email: mp+106524@code.launchpad.net

Description of the change

Testers should really test the last item in the branch pipeline lp:~compiz-team/compiz/build-fixes-part-10-animationaddon-plugin

Use gtest_add_tests where appropriate, remove dep on xvfb

To post a comment you must log in.
3217. By Sam Spilsbury on 2012-05-20

Merged build-fixes-part-7-libcompizconfig-backend-env into build-fixes-part-8-gtest-add-tests.

Unmerged revisions

3217. By Sam Spilsbury on 2012-05-20

Merged build-fixes-part-7-libcompizconfig-backend-env into build-fixes-part-8-gtest-add-tests.

3216. By Sam Spilsbury on 2012-05-20

There is no reason why the wrapsystem tests need an X Server

3215. By Sam Spilsbury on 2012-05-20

Set the environment in the test harness as SET_TESTS_PROPERTIES appears
to not work

3214. By Sam Spilsbury on 2012-05-20

Fix useless uninstall rule and add code to allow the compizconfig-python
tests to be run without compizconfig actually being installed ... CTest
doesn't quite get it yet though

3213. By Sam Spilsbury on 2012-05-19

Build compizconfig-python

3212. By Sam Spilsbury on 2012-05-19

Merged build-fixes-part-5-gsettings-warnings into build-fixes-part-6-remove-pyclean.

3211. By Sam Spilsbury on 2012-05-19

Be smarter about building ccsm

3210. By Sam Spilsbury on 2012-05-19

Fix warnings in gsettings backend

3209. By Sam Spilsbury on 2012-05-19

Fix warnings in gconf.c

3208. By Sam Spilsbury on 2012-05-19

Added a note about target regeneration

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/wrapsystem/tests/CMakeLists.txt'
2--- src/wrapsystem/tests/CMakeLists.txt 2012-05-20 11:08:29 +0000
3+++ src/wrapsystem/tests/CMakeLists.txt 2012-05-20 11:08:35 +0000
4@@ -15,4 +15,4 @@
5 ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
6 )
7
8-add_test( compiz_wrapsystem_test "/bin/bash" "${CMAKE_SOURCE_DIR}/scripts/run-with-xvfb.sh" "./compiz_wrapsystem_test" )
9+gtest_add_tests (${CMAKE_CURRENT_BINARY_DIR}/compiz_wrapsystem_test "" "test-wrapsystem.cpp")

Subscribers

People subscribed via source and target branches