Revert "test-autolaunch is only known to work in launchd environments."
authorWill Thompson <will.thompson@collabora.co.uk>
Mon, 13 Dec 2010 17:54:57 +0000 (17:54 +0000)
committerRalf Habacker <ralf.habacker@freenet.de>
Wed, 15 Dec 2010 08:43:17 +0000 (09:43 +0100)
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.

test/name-test/Makefile.am

index a3c5166..1b5722b 100644 (file)
@@ -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