Application Menu Indicator

Merge lp:~ken-vandine/indicator-appmenu/tests_use_builddir into lp:indicator-appmenu/0.4

  1. tests_use_builddir
  2. Merge into trunk.0.4
Proposed by Ken VanDine
Status: Merged
Approved by: Charles Kerr
Approved revision: 194
Merge reported by: Charles Kerr
Merged at revision: not available
Proposed branch: lp:~ken-vandine/indicator-appmenu/tests_use_builddir
Merge into: lp:indicator-appmenu/0.4
Diff against target: 12 lines (+1/-1)
1 file modified
tests/test-dbus-message-count.in (+1/-1)
To merge this branch: bzr merge lp:~ken-vandine/indicator-appmenu/tests_use_builddir
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
Review via email: mp+99954@code.launchpad.net

Description of the change

Use mock-json-app in the builddir instead of depending on an installed version of indicator-appmenu-tools, which causes a bootstrapping problem

To post a comment you must log in.
Revision history for this message
Charles Kerr (charlesk) wrote :

Looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/test-dbus-message-count.in'
2--- tests/test-dbus-message-count.in 2012-03-27 16:38:41 +0000
3+++ tests/test-dbus-message-count.in 2012-03-29 14:20:37 +0000
4@@ -11,7 +11,7 @@
5 --task /usr/lib/bamf/bamfdaemon --task-name bamf \
6 --task @top_builddir@/src/hud-service --task-name hud --wait-for org.ayatana.bamf \
7 --task /usr/lib/libindicator/indicator-loader3 --parameter @top_builddir@/src/.libs/libappmenu.so --task-name appmenu --wait-for org.ayatana.bamf \
8- --task /usr/lib/indicator-appmenu/mock-json-app --parameter @srcdir@/test-dbus-message-count.json --wait-for com.canonical.AppMenu.Registrar --task-name app \
9+ --task @top_builddir@/tools/mock-json-app --parameter @srcdir@/test-dbus-message-count.json --wait-for com.canonical.AppMenu.Registrar --task-name app \
10 --task @srcdir@/test-dbus-message-count-send-query --wait-for com.canonical.AppMenu.Registrar --task-name query
11
12 sleep 1

Subscribers

People subscribed via source and target branches