From c3a94b57c8a28a0b80b0675c2098b70378f5a371 Mon Sep 17 00:00:00 2001 From: Will Thompson Date: Mon, 13 Dec 2010 17:54:57 +0000 Subject: [PATCH] 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. --- test/name-test/Makefile.am | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/test/name-test/Makefile.am b/test/name-test/Makefile.am index a3c5166..1b5722b 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 -- 2.7.4