Attachment 47890 Details for Bug 34405 – [PATCH 4/5 v2] Run bus tests from test/

[patch] [PATCH 4/5 v2] Run bus tests from test/

0001-Run-bus-tests-from-test.patch (text/plain), 2.64 KB, created by Simon McVittie on 2011-06-13 03:13:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-06-13 03:13:10 UTC

Size: 2.64 KB

patch

obsolete

>From 63ed48edad15c0cce4789710d799fe89d8d41a2c Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Mon, 13 Jun 2011 11:11:31 +0100
>Subject: [PATCH] Run bus tests from test/
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34405
>---
> bus/Makefile.am  |   22 ++++++++++++----------
> test/Makefile.am |    5 +++++
> 2 files changed, 17 insertions(+), 10 deletions(-)
>
>diff --git a/bus/Makefile.am b/bus/Makefile.am
>index 9761c27..a3ddb6c 100644
>--- a/bus/Makefile.am
>+++ b/bus/Makefile.am
>@@ -146,25 +146,27 @@ bus_test_launch_helper_CPPFLAGS= -DDBUS_STATIC_BUILD	\
> 	-DACTIVATION_LAUNCHER_TEST	\
> 	-DACTIVATION_LAUNCHER_DO_OOM
> 
>-## we use noinst_PROGRAMS not check_PROGRAMS so that we build
>-## even when not doing "make check"
>-noinst_PROGRAMS = $(TESTS)
>+noinst_PROGRAMS =
> dbus_daemon_exec_PROGRAMS = dbus-daemon
> if DBUS_UNIX
> libexec_PROGRAMS = dbus-daemon-launch-helper
> endif DBUS_UNIX
> 
>-## note that TESTS has special meaning (stuff to use in make check)
>-## so if adding tests not to be run in make check, don't add them to
>-## TESTS
>-TESTS =
>+## Note that TESTS has special meaning (stuff to use in make check).
>+## We don't actually want to run any of these tests until test/ has been
>+## compiled, so we don't put them in TESTS here; we run them in test/
>+## instead.
> 
> if DBUS_BUILD_TESTS
>-TESTS_ENVIRONMENT=DBUS_TEST_DATA=$(top_builddir)/test/data DBUS_TEST_HOMEDIR=$(top_builddir)/dbus DBUS_FATAL_WARNINGS=1 DBUS_BLOCK_ON_ABORT=1
>-TESTS += bus-test bus-test-system
>+## we use noinst_PROGRAMS not check_PROGRAMS so that we build
>+## even when not doing "make check"
>+
>+# run as a test by test/Makefile.am
>+noinst_PROGRAMS += bus-test bus-test-system
> 
> if DBUS_UNIX
>-TESTS += bus-test-launch-helper
>+# run as a test by test/Makefile.am
>+noinst_PROGRAMS += bus-test-launch-helper
> # this is used by the tests but is not,itself, a test
> noinst_PROGRAMS += dbus-daemon-launch-helper-test
> endif DBUS_UNIX
>diff --git a/test/Makefile.am b/test/Makefile.am
>index 564300d..d2a846d 100644
>--- a/test/Makefile.am
>+++ b/test/Makefile.am
>@@ -34,6 +34,9 @@ TESTS = \
> ## order, but we don't want to run them til we arrive in this directory,
> ## since they depend on stuff from this directory
> TESTS += \
>+	../bus/bus-test \
>+	../bus/bus-test-system \
>+	../bus/bus-test-launch-helper \
> 	../dbus/dbus-test \
> 	$(NULL)
> 
>@@ -111,6 +114,8 @@ installcheck_environment = \
> 	DBUS_TEST_SYSCONFDIR=$(DESTDIR)$(sysconfdir)
> 
> TESTS_ENVIRONMENT = \
>+	DBUS_BLOCK_ON_ABORT=1 \
>+	DBUS_FATAL_WARNINGS=1 \
> 	DBUS_TEST_DAEMON=@abs_top_builddir@/bus/dbus-daemon$(EXEEXT) \
> 	DBUS_TEST_DATA=@abs_top_builddir@/test/data \
> 	DBUS_TEST_HOMEDIR=@abs_top_builddir@/dbus \
>-- 
>1.7.5.4
>

Actions: View | Splinter Review

Attachments on bug 34405: 47609 | 47610 | 47611 | 47612 | 47613 | 47888 | 47890 | 47993

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.