Unity

Merge lp:~aacid/unity/compile_faster into lp:unity

  1. compile_faster
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Albert Astals Cid
Approved revision: no longer in the source branch.
Merged at revision: 2863
Proposed branch: lp:~aacid/unity/compile_faster
Merge into: lp:unity
Diff against target: 181 lines (+2/-144)
1 file modified
tests/CMakeLists.txt (+2/-144)
To merge this branch: bzr merge lp:~aacid/unity/compile_faster
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Marco Trevisan (Treviño) Approve
Review via email: mp+130564@code.launchpad.net

Commit message

Compile faster (by compiling less stuff twice)

Description of the change

Compile faster (by compiling less stuff twice)

My build from scratch with make -j10 goes from
real 6m43.968s
user 47m3.992s
sys 2m40.926s

to

real 5m11.417s
user 35m29.861s
sys 1m58.103s

So 12 minutes of "cpu time" saved and 1:30 of "real time" saved :-)

To post a comment you must log in.
Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

Thanks, we needed this.

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/68/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/68/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/68/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Albert Astals Cid (aacid) wrote :

Reapproving, let's see if the build bot was fixed over the weekend.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/CMakeLists.txt'
2--- tests/CMakeLists.txt 2012-10-18 10:44:07 +0000
3+++ tests/CMakeLists.txt 2012-10-19 14:40:28 +0000
4@@ -63,9 +63,6 @@
5 unit/TestMain.cpp
6 unit/TestPanelService.cpp
7 unit/TestStaticCairoText.cpp
8- ${CMAKE_SOURCE_DIR}/launcher/CairoBaseWindow.cpp
9- ${CMAKE_SOURCE_DIR}/unity-shared/Introspectable.cpp
10- ${CMAKE_SOURCE_DIR}/unity-shared/StaticCairoText.cpp
11 ../services/panel-service.c
12 ${CMAKE_CURRENT_BINARY_DIR}/panel-marshal.c
13 )
14@@ -149,37 +146,17 @@
15 test_ubus.cpp
16 test_unityshell_private.cpp
17 ${CMAKE_CURRENT_BINARY_DIR}/test_glib_signals_utils_marshal.cpp
18- ${CMAKE_SOURCE_DIR}/launcher/AbstractLauncherIcon.cpp
19- ${CMAKE_SOURCE_DIR}/unity-shared/Animator.cpp
20 ${UNITY_SRC}/DebugDBusInterface.cpp
21 ${UNITY_SRC}/XPathQueryPart.cpp
22- ${CMAKE_SOURCE_DIR}/launcher/FavoriteStore.cpp
23- ${CMAKE_SOURCE_DIR}/launcher/FavoriteStoreGSettings.cpp
24- ${CMAKE_SOURCE_DIR}/unity-shared/IconTextureSource.cpp
25- ${CMAKE_SOURCE_DIR}/launcher/LauncherModel.cpp
26- ${CMAKE_SOURCE_DIR}/launcher/LauncherEntryRemote.cpp
27- ${CMAKE_SOURCE_DIR}/launcher/MockLauncherIcon.cpp
28- ${CMAKE_SOURCE_DIR}/launcher/FavoriteStorePrivate.cpp
29- ${CMAKE_SOURCE_DIR}/launcher/PointerBarrier.cpp
30- ${CMAKE_SOURCE_DIR}/shortcuts/ShortcutModel.cpp
31- ${CMAKE_SOURCE_DIR}/shortcuts/ShortcutHintPrivate.cpp
32- ${CMAKE_SOURCE_DIR}/unity-shared/Introspectable.cpp
33- ${CMAKE_SOURCE_DIR}/unity-shared/TextureCache.cpp
34- ${CMAKE_SOURCE_DIR}/unity-shared/Timer.cpp
35- ${CMAKE_SOURCE_DIR}/unity-shared/UBusServer.cpp
36- ${CMAKE_SOURCE_DIR}/unity-shared/UBusWrapper.cpp
37 ${UNITY_SRC}/UnityshellPrivate.cpp
38- ${CMAKE_SOURCE_DIR}/unity-shared/WindowManager.cpp
39- ${CMAKE_SOURCE_DIR}/unity-shared/StandaloneWindowManager.cpp
40 ${UNITY_SRC}/UnityShowdesktopHandler.cpp
41 ${CMAKE_SOURCE_DIR}/plugins/unity-mt-grab-handles/src/unity-mt-grab-handle.cpp
42 ${CMAKE_SOURCE_DIR}/plugins/unity-mt-grab-handles/src/unity-mt-grab-handle-group.cpp
43 ${CMAKE_SOURCE_DIR}/plugins/unity-mt-grab-handles/src/unity-mt-grab-handle-impl-factory.cpp
44 ${CMAKE_SOURCE_DIR}/plugins/unity-mt-grab-handles/src/unity-mt-grab-handle-layout.cpp
45 ${CMAKE_SOURCE_DIR}/plugins/unity-mt-grab-handles/src/unity-mt-texture.cpp
46- ${CMAKE_SOURCE_DIR}/hud/HudPrivate.cpp
47 )
48- target_link_libraries(test-gtest-xless gtest unity-shared ${GMOCK_LIB} ${GMOCK_MAIN_LIB} ${LIBS})
49+ target_link_libraries(test-gtest-xless gtest unity-shared ${GMOCK_LIB} ${GMOCK_MAIN_LIB} ${LIBS} launcher-lib shortcuts-lib hud-lib)
50 add_test(UnityGTestXless test-gtest-xless)
51 add_dependencies(test-gtest-xless unity-core-${UNITY_API_VERSION} gtest)
52
53@@ -247,128 +224,9 @@
54 bamf-mock-application.c
55 gmockmount.c
56 gmockvolume.c
57- ${CMAKE_SOURCE_DIR}/dash/DashViewPrivate.cpp
58- ${CMAKE_SOURCE_DIR}/dash/ResultRenderer.cpp
59- ${CMAKE_SOURCE_DIR}/dash/PlacesGroup.cpp
60- ${CMAKE_SOURCE_DIR}/dash/ResultRenderer.cpp
61- ${CMAKE_SOURCE_DIR}/dash/ResultRendererHorizontalTile.cpp
62- ${CMAKE_SOURCE_DIR}/dash/ResultRendererTile.cpp
63- ${CMAKE_SOURCE_DIR}/dash/ResultView.cpp
64- ${CMAKE_SOURCE_DIR}/dash/ResultViewGrid.cpp
65- ${CMAKE_SOURCE_DIR}/dash/previews/ActionButton.cpp
66- ${CMAKE_SOURCE_DIR}/dash/previews/ApplicationPreview.cpp
67- ${CMAKE_SOURCE_DIR}/dash/previews/GenericPreview.cpp
68- ${CMAKE_SOURCE_DIR}/dash/previews/MoviePreview.cpp
69- ${CMAKE_SOURCE_DIR}/dash/previews/MusicPreview.cpp
70- ${CMAKE_SOURCE_DIR}/dash/previews/Preview.cpp
71- ${CMAKE_SOURCE_DIR}/dash/previews/PreviewInfoHintWidget.cpp
72- ${CMAKE_SOURCE_DIR}/dash/previews/PreviewRatingsWidget.cpp
73- ${CMAKE_SOURCE_DIR}/dash/previews/SocialPreview.cpp
74- ${CMAKE_SOURCE_DIR}/dash/previews/SocialPreviewContent.cpp
75- ${CMAKE_SOURCE_DIR}/dash/previews/SocialPreviewComments.cpp
76- ${CMAKE_SOURCE_DIR}/dash/previews/Tracks.cpp
77- ${CMAKE_SOURCE_DIR}/dash/previews/Track.cpp
78- ${CMAKE_SOURCE_DIR}/hud/HudAbstractView.cpp
79- ${CMAKE_SOURCE_DIR}/hud/HudButton.cpp
80- ${CMAKE_SOURCE_DIR}/hud/HudController.cpp
81- ${CMAKE_SOURCE_DIR}/hud/HudIcon.cpp
82- ${CMAKE_SOURCE_DIR}/hud/HudIconTextureSource.cpp
83- ${CMAKE_SOURCE_DIR}/hud/HudPrivate.cpp
84- ${CMAKE_SOURCE_DIR}/hud/HudView.cpp
85- ${CMAKE_SOURCE_DIR}/launcher/AbstractLauncherIcon.cpp
86- ${CMAKE_SOURCE_DIR}/launcher/ApplicationLauncherIcon.cpp
87- ${CMAKE_SOURCE_DIR}/launcher/BFBLauncherIcon.cpp
88- ${CMAKE_SOURCE_DIR}/launcher/CairoBaseWindow.cpp
89- ${CMAKE_SOURCE_DIR}/launcher/DNDCollectionWindow.cpp
90- ${CMAKE_SOURCE_DIR}/launcher/Decaymulator.cpp
91- ${CMAKE_SOURCE_DIR}/launcher/DesktopLauncherIcon.cpp
92- ${CMAKE_SOURCE_DIR}/launcher/DeviceLauncherSection.cpp
93- ${CMAKE_SOURCE_DIR}/launcher/DeviceNotificationDisplayImp.cpp
94- ${CMAKE_SOURCE_DIR}/launcher/DevicesSettingsImp.cpp
95- ${CMAKE_SOURCE_DIR}/launcher/DndData.cpp
96- ${CMAKE_SOURCE_DIR}/launcher/EdgeBarrierController.cpp
97- ${CMAKE_SOURCE_DIR}/launcher/ExpoLauncherIcon.cpp
98- ${CMAKE_SOURCE_DIR}/launcher/FavoriteStore.cpp
99- ${CMAKE_SOURCE_DIR}/launcher/FavoriteStoreGSettings.cpp
100- ${CMAKE_SOURCE_DIR}/launcher/FavoriteStorePrivate.cpp
101- ${CMAKE_SOURCE_DIR}/launcher/FileManagerOpenerImp.cpp
102- ${CMAKE_SOURCE_DIR}/launcher/HudLauncherIcon.cpp
103- ${CMAKE_SOURCE_DIR}/launcher/Launcher.cpp
104- ${CMAKE_SOURCE_DIR}/launcher/LauncherController.cpp
105- ${CMAKE_SOURCE_DIR}/launcher/LauncherDragWindow.cpp
106- ${CMAKE_SOURCE_DIR}/launcher/LauncherEntryRemote.cpp
107- ${CMAKE_SOURCE_DIR}/launcher/LauncherEntryRemoteModel.cpp
108- ${CMAKE_SOURCE_DIR}/launcher/LauncherHideMachine.cpp
109- ${CMAKE_SOURCE_DIR}/launcher/LauncherHoverMachine.cpp
110- ${CMAKE_SOURCE_DIR}/launcher/LauncherIcon.cpp
111- ${CMAKE_SOURCE_DIR}/launcher/LauncherModel.cpp
112- ${CMAKE_SOURCE_DIR}/launcher/LauncherOptions.cpp
113- ${CMAKE_SOURCE_DIR}/launcher/LayoutSystem.cpp
114- ${CMAKE_SOURCE_DIR}/launcher/MockLauncherIcon.cpp
115- ${CMAKE_SOURCE_DIR}/launcher/PointerBarrier.cpp
116- ${CMAKE_SOURCE_DIR}/launcher/QuicklistManager.cpp
117- ${CMAKE_SOURCE_DIR}/launcher/QuicklistMenuItem.cpp
118- ${CMAKE_SOURCE_DIR}/launcher/QuicklistMenuItemCheckmark.cpp
119- ${CMAKE_SOURCE_DIR}/launcher/QuicklistMenuItemLabel.cpp
120- ${CMAKE_SOURCE_DIR}/launcher/QuicklistMenuItemRadio.cpp
121- ${CMAKE_SOURCE_DIR}/launcher/QuicklistMenuItemSeparator.cpp
122- ${CMAKE_SOURCE_DIR}/launcher/QuicklistView.cpp
123- ${CMAKE_SOURCE_DIR}/launcher/SimpleLauncherIcon.cpp
124- ${CMAKE_SOURCE_DIR}/launcher/SingleMonitorLauncherIcon.cpp
125- ${CMAKE_SOURCE_DIR}/launcher/SoftwareCenterLauncherIcon.cpp
126- ${CMAKE_SOURCE_DIR}/launcher/SpacerLauncherIcon.cpp
127- ${CMAKE_SOURCE_DIR}/launcher/SwitcherController.cpp
128- ${CMAKE_SOURCE_DIR}/launcher/SwitcherModel.cpp
129- ${CMAKE_SOURCE_DIR}/launcher/SwitcherView.cpp
130- ${CMAKE_SOURCE_DIR}/launcher/Tooltip.cpp
131- ${CMAKE_SOURCE_DIR}/launcher/TrashLauncherIcon.cpp
132- ${CMAKE_SOURCE_DIR}/launcher/VolumeImp.cpp
133- ${CMAKE_SOURCE_DIR}/launcher/VolumeLauncherIcon.cpp
134- ${CMAKE_SOURCE_DIR}/launcher/VolumeMonitorWrapper.cpp
135- ${CMAKE_SOURCE_DIR}/shortcuts/ShortcutController.cpp
136- ${CMAKE_SOURCE_DIR}/shortcuts/ShortcutModel.cpp
137- #${CMAKE_SOURCE_DIR}/shortcuts/ShortcutHintPrivate.cpp
138- ${CMAKE_SOURCE_DIR}/shortcuts/ShortcutView.cpp
139- ${CMAKE_SOURCE_DIR}/unity-shared/AbstractSeparator.cpp
140- ${CMAKE_SOURCE_DIR}/unity-shared/Animator.cpp
141- ${CMAKE_SOURCE_DIR}/unity-shared/BackgroundEffectHelper.cpp
142- ${CMAKE_SOURCE_DIR}/unity-shared/CoverArt.cpp
143- ${CMAKE_SOURCE_DIR}/unity-shared/DashStyle.cpp
144- ${CMAKE_SOURCE_DIR}/unity-shared/DefaultThumbnailProvider.cpp
145- ${CMAKE_SOURCE_DIR}/unity-shared/IconLoader.cpp
146- ${CMAKE_SOURCE_DIR}/unity-shared/IconRenderer.cpp
147- ${CMAKE_SOURCE_DIR}/unity-shared/IconTexture.cpp
148- ${CMAKE_SOURCE_DIR}/unity-shared/IconTextureSource.cpp
149- ${CMAKE_SOURCE_DIR}/unity-shared/IMTextEntry.cpp
150- ${CMAKE_SOURCE_DIR}/unity-shared/Introspectable.cpp
151- ${CMAKE_SOURCE_DIR}/unity-shared/IntrospectableWrappers.cpp
152- ${CMAKE_SOURCE_DIR}/unity-shared/LineSeparator.cpp
153- ${CMAKE_SOURCE_DIR}/unity-shared/JSONParser.cpp
154- ${CMAKE_SOURCE_DIR}/unity-shared/OverlayRenderer.cpp
155- ${CMAKE_SOURCE_DIR}/unity-shared/PanelStyle.cpp
156- ${CMAKE_SOURCE_DIR}/unity-shared/PlacesVScrollBar.cpp
157- ${CMAKE_SOURCE_DIR}/unity-shared/PreviewStyle.cpp
158- ${CMAKE_SOURCE_DIR}/unity-shared/RatingsButton.cpp
159- ${CMAKE_SOURCE_DIR}/unity-shared/SearchBar.cpp
160- ${CMAKE_SOURCE_DIR}/unity-shared/SearchBarSpinner.cpp
161- ${CMAKE_SOURCE_DIR}/unity-shared/StandaloneWindowManager.cpp
162- ${CMAKE_SOURCE_DIR}/unity-shared/StaticCairoText.cpp
163- ${CMAKE_SOURCE_DIR}/unity-shared/TextureCache.cpp
164- ${CMAKE_SOURCE_DIR}/unity-shared/Timer.cpp
165- ${CMAKE_SOURCE_DIR}/unity-shared/TextureThumbnailProvider.cpp
166- ${CMAKE_SOURCE_DIR}/unity-shared/ThumbnailGenerator.cpp
167- ${CMAKE_SOURCE_DIR}/unity-shared/UBusServer.cpp
168- ${CMAKE_SOURCE_DIR}/unity-shared/UBusWrapper.cpp
169- ${CMAKE_SOURCE_DIR}/unity-shared/UScreen.cpp
170- ${CMAKE_SOURCE_DIR}/unity-shared/UnitySettings.cpp
171- ${CMAKE_SOURCE_DIR}/unity-shared/UnityWindowStyle.cpp
172- ${CMAKE_SOURCE_DIR}/unity-shared/UnityWindowView.cpp
173- ${CMAKE_SOURCE_DIR}/unity-shared/UserThumbnailProvider.cpp
174- ${CMAKE_SOURCE_DIR}/unity-shared/WindowManager.cpp
175- ${CMAKE_SOURCE_DIR}/unity-shared/XKeyboardUtil.cpp
176 ${CMAKE_SOURCE_DIR}/plugins/unityshell/src/WindowMinimizeSpeedController.cpp
177 )
178- target_link_libraries(test-gtest gtest gmock unity-shared ${LIBS})
179+ target_link_libraries(test-gtest gtest gmock unity-shared ${LIBS} launcher-lib unity-shared-standalone shortcuts-lib previews-lib hud-lib switcher-lib dash-lib)
180 add_test(UnityGTest test-gtest)
181 add_dependencies(test-gtest unity-core-${UNITY_API_VERSION} gtest gmock)
182