summaryrefslogtreecommitdiff
path: root/tests/CMakeLists.txt
diff options
authorBrandon Schaefer <brandon.schaefer@canonical.com>2012-11-20 13:08:54 -0800
committerBrandon Schaefer <brandon.schaefer@canonical.com>2012-11-20 13:08:54 -0800
commit6e2cc96deed77bdfbcaa009cfdf086546a14d8ab (patch)
tree1793b646d7d8b314aaa8fbba406fb3300cb75951 /tests/CMakeLists.txt
parentddb92f30c40d8e2044f174c72b41522372fd031c (diff)
parent330f458e4702d6a66f420221ff6ba55b3108a071 (diff)
* Merged Trunk
* Automatic snapshot from revision 2905 (bootstrap) - Hide launcher tooltip once shortcut overlay appears (LP: #1035860) - Update shortcut overlay design (LP: #1049601) - Don't cut off shadow on launcher icon drag window (LP: #765715) - Provide more immediate feedback when clickong on launcher (LP: #893140) - Decorate spread windows in switcher (LP: #838222) - Make sure to initialize a variable before it can be used (LP: #1073516) - Fix FTBFS due to BAMF API change (LP: #1077937) - Run gtest during build (LP: #133637) - Make shopping lens test more robust (LP: #1077131) - Fix some random autopilot test failures (LP: #1078448) - Fix autopilot tests for details mode (LP: #1073892) - Fix autopilot tests for indicator-session (LP: #1075350) - Fix autopilot tests for non-English locales (LP: #1075898) - add libunity-core -> unity-common dep (LP: #1079132) - do not have unity-common dep on compiz-gnome: the migration code is only ran if compiz-gnome is installed, but compiz-gnome is pulled by compiz directly. We don't care if the migration code isn't executed. [ Ricardo Salveti de Araujo ] * Doesn't need to depend on gcc 4.6 anymore (LP: #1044836) * New upstream release. - Includes two already cherry-picked fixes in Ubuntu - Unregister gdbus object in the dtor (LP: #1047760) - Top panel "tooltip" got out of sync when navigating with the keyboard (LP: #1067358) - Fix escaping of _panel_title (LP: #1067357) - Fix ALT+Tab switches to incorrect window (LP: #1071298) - Stop Unity UI elements from flickering in some cases (LP: #1070735) (bzr r2892.5.19)
Diffstat (limited to 'tests/CMakeLists.txt')
-rw-r--r--tests/CMakeLists.txt3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index cd12621ad..3adaff164 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -136,6 +136,7 @@ if (GTEST_SRC_DIR AND
test_favorite_store_private.cpp
test_home_lens.cpp
test_launcher_entry_remote.cpp
+ test_layout_system.cpp
test_model_iterator.cpp
test_previews.cpp
test_ubus.cpp
@@ -152,6 +153,7 @@ if (GTEST_SRC_DIR AND
set (GTEST_XLESS_LIBS
gtest
unity-shared
+ unity-shared-standalone
launcher-lib
${GMOCK_LIB}
${GMOCK_MAIN_LIB}
@@ -160,6 +162,7 @@ if (GTEST_SRC_DIR AND
if (ENABLE_X_SUPPORT)
set (GTEST_XLESS_SOURCES
+ ${GTEST_XLESS_SOURCES}
test_hud_private.cpp
test_pointer_barrier.cpp
test_shortcut_model.cpp