From 1ce029a7b4d62d9aaa12cb83ffdc1f979028d43d Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 9 Nov 2011 17:19:19 +0000 Subject: [PATCH 2/2] Mark shell-test as modular and installable This test needs non-public API and so is statically linked, but is OK to install. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=42811 Signed-off-by: Simon McVittie --- test/Makefile.am | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) diff --git a/test/Makefile.am b/test/Makefile.am index 9b5b3b1..78aa313 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -12,9 +12,8 @@ noinst_LTLIBRARIES = libdbus-testutils.la if DBUS_BUILD_TESTS ## break-loader removed for now -## most of these binaries are used in tests but are not themselves tests +## these binaries are used in tests but are not themselves tests TEST_BINARIES = \ - shell-test \ spawn-test \ test-exit \ test-names \ @@ -24,16 +23,10 @@ TEST_BINARIES = \ test-sleep-forever \ $(NULL) -## these are the things to run in make check (i.e. they are actual tests) -## (binaries in here must also be in TEST_BINARIES) -TESTS = \ - shell-test \ - $(NULL) - ## These are conceptually part of directories that come earlier in SUBDIRS ## order, but we don't want to run them til we arrive in this directory, ## since they depend on stuff from this directory -TESTS += \ +TESTS = \ ../bus/bus-test$(EXEEXT) \ ../bus/bus-test-system$(EXEEXT) \ ../dbus/dbus-test$(EXEEXT) \ @@ -112,6 +105,7 @@ testexecdir = $(libdir)/dbus-1.0/test testexec_PROGRAMS = installable_tests = \ + shell-test \ $(NULL) if DBUS_WITH_GLIB -- 1.7.7.2