diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-11-09 17:19:19 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-02-21 15:15:28 +0000 |
| commit | 37f41b64a9e336c365667eaaa8969a15b4cd907e (patch) | |
| tree | e1e7b63fe408a8650305b2e44dd23c75af749e8b | |
| parent | 4b31fcf4d4c2d1205bd9133f56e8ca9f6c038046 (diff) | |
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 <simon.mcvittie@collabora.co.uk>
| -rw-r--r-- | test/Makefile.am | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 8457fcd1..f2abe285 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -32,9 +32,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 \ @@ -44,16 +43,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) \ @@ -100,6 +93,7 @@ testexecdir = $(libdir)/dbus-1.0/test testexec_PROGRAMS = installable_tests = \ + shell-test \ $(NULL) if DBUS_WITH_GLIB |