diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2012-06-18 14:29:44 -0500 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2012-06-18 14:29:44 -0500 |
| commit | 00ea2953484b380d572381a6e17b8c9aec1097e3 (patch) | |
| tree | 64dd63272a08b81432e4f28f7f2ddd33da7af560 | |
| parent | 582b25fa3feb01f28196c6c26c898f859afeb808 (diff) | |
| parent | 4fc9c62ab2356caeaac7fc7dd968bdf0cb838d46 (diff) | |
| download | libdbusmenu-00ea2953484b380d572381a6e17b8c9aec1097e3.tar.gz libdbusmenu-00ea2953484b380d572381a6e17b8c9aec1097e3.tar.bz2 libdbusmenu-00ea2953484b380d572381a6e17b8c9aec1097e3.zip | |
merge lp:~evgeni/dbusmenu/optional-valgrind to allow dbusmenu to build and run its non-valgrind checks on architectures where valgrind isn't available.
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | tests/Makefile.am | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 94bba0c..608e80d 100644 --- a/configure.ac +++ b/configure.ac @@ -121,7 +121,8 @@ PKG_CHECK_MODULES(DBUSMENUTESTS, json-glib-1.0 >= $JSON_GLIB_REQUIRED_VERSION gio-unix-2.0 >= $GIO_UNIX_REQUIRED_VERSION, [have_tests=yes] ) -PKG_CHECK_MODULES(DBUSMENUTESTSVALGRIND, valgrind) +PKG_CHECK_MODULES(DBUSMENUTESTSVALGRIND, valgrind, have_valgrind=yes, have_valgrind=no) +AM_CONDITIONAL([HAVE_VALGRIND], [test "x$have_valgrind" = "xyes"]) ]) AC_SUBST(DBUSMENUTESTS_CFLAGS) diff --git a/tests/Makefile.am b/tests/Makefile.am index df87dc8..c375562 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -16,10 +16,12 @@ TESTS = \ test-glib-submenu if WANT_DBUSMENUDUMPER +if HAVE_VALGRIND TESTS += \ test-json \ test-json-instruction endif +endif if WANT_LIBDBUSMENUGTK TESTS += \ @@ -59,10 +61,12 @@ check_PROGRAMS = \ test-glib-simple-items if WANT_DBUSMENUDUMPER +if HAVE_VALGRIND check_PROGRAMS += \ test-json-client \ test-json-server endif +endif if WANT_LIBDBUSMENUGTK check_PROGRAMS += \ |