DBus Menu

Merge lp:~ted/libdbusmenu/valgrind-no-libs into lp:libdbusmenu/0.6

  1. valgrind-no-libs
  2. Merge into trunk.0.6
Proposed by Ted Gould
Status: Merged
Approved by: Charles Kerr
Approved revision: 398
Merge reported by: Charles Kerr
Merged at revision: not available
Proposed branch: lp:~ted/libdbusmenu/valgrind-no-libs
Merge into: lp:libdbusmenu/0.6
Diff against target: 28 lines (+3/-2)
2 files modified
configure.ac (+2/-2)
tests/Makefile.am (+1/-0)
To merge this branch: bzr merge lp:~ted/libdbusmenu/valgrind-no-libs
Reviewer Review Type Date Requested Status
Charles Kerr (community) Approve
Review via email: mp+100423@code.launchpad.net

Description of the change

Removing the valgrind lib as it isn't needed and screws up ARM.

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

I wouldn't've expected that... lucky break :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2012-03-29 18:08:49 +0000
3+++ configure.ac 2012-04-02 14:28:25 +0000
4@@ -118,10 +118,10 @@
5
6 AS_IF([test "x$enable_tests" != "xno"],[
7 PKG_CHECK_MODULES(DBUSMENUTESTS, json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION
8- gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION
9- valgrind,
10+ gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION,
11 [have_tests=yes]
12 )
13+PKG_CHECK_MODULES(DBUSMENUTESTSVALGRIND, valgrind)
14 ])
15
16 AC_SUBST(DBUSMENUTESTS_CFLAGS)
17
18=== modified file 'tests/Makefile.am'
19--- tests/Makefile.am 2012-03-29 04:30:40 +0000
20+++ tests/Makefile.am 2012-04-02 14:28:25 +0000
21@@ -223,6 +223,7 @@
22 -I $(srcdir) \
23 $(DBUSMENUGLIB_CFLAGS) \
24 $(DBUSMENUTESTS_CFLAGS) \
25+ $(DBUSMENUTESTSVALGRIND_CFLAGS) \
26 -Wall -Werror
27
28 test_json_server_LDADD = \

Subscribers

People subscribed via source and target branches

to all changes: