diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2010-12-13 17:54:57 +0000 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2010-12-15 09:43:17 +0100 |
| commit | c3a94b57c8a28a0b80b0675c2098b70378f5a371 (patch) | |
| tree | f96d84453ef7e3c9e26fb41a4f4f2406922c0744 /test | |
| parent | a7e5b20e6a2eaf0622c316555279caa9865a4a46 (diff) | |
| download | dbus-c3a94b57c8a28a0b80b0675c2098b70378f5a371.tar.gz | |
Revert "test-autolaunch is only known to work in launchd environments."
This reverts commit 4626b405609900812125a407ef5fdd31c7b89868.
test-autolaunch works fine in non-launchd environments (and non-X11
environments, based on a quick test passing enable_x11=no to configure).
On the contrary: this commit *broke* the build on non-launchd
environments, because test/name-test/run-test.sh still tried to run this
test even if it hadn't been built.
Diffstat (limited to 'test')
| -rw-r--r-- | test/name-test/Makefile.am | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/test/name-test/Makefile.am b/test/name-test/Makefile.am index a3c5166a..1b5722b0 100644 --- a/test/name-test/Makefile.am +++ b/test/name-test/Makefile.am @@ -16,11 +16,7 @@ if DBUS_BUILD_TESTS ## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we ## build even when not doing "make check" -noinst_PROGRAMS=test-pending-call-dispatch test-pending-call-timeout test-threads-init test-ids test-shutdown test-privserver test-privserver-client - -if DBUS_ENABLE_LAUNCHD -noinst_PROGRAMS+=test-autolaunch -endif +noinst_PROGRAMS=test-pending-call-dispatch test-pending-call-timeout test-threads-init test-ids test-shutdown test-privserver test-privserver-client test-autolaunch test_names_SOURCES= \ test-names.c |