Attachment 47609 Details for Bug 34405 – [PATCH 1/5] test/Makefile.am: list tests one per line

[patch] [PATCH 1/5] test/Makefile.am: list tests one per line

0001-test-Makefile.am-list-tests-one-per-line.patch (text/plain), 1.38 KB, created by Simon McVittie on 2011-06-06 08:17:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-06-06 08:17:38 UTC

Size: 1.38 KB

patch

obsolete

>From 8701540621e23c7e14707e3ce309afabb483962f Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Mon, 6 Jun 2011 15:01:52 +0100
>Subject: [PATCH 1/5] test/Makefile.am: list tests one per line
>
>This improves clarity, and makes conflicts less likely and merges more
>obviously correct.
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34405
>---
> test/Makefile.am |   22 ++++++++++++++++++----
> 1 files changed, 18 insertions(+), 4 deletions(-)
>
>diff --git a/test/Makefile.am b/test/Makefile.am
>index 9d0681b..4bd4640 100644
>--- a/test/Makefile.am
>+++ b/test/Makefile.am
>@@ -13,15 +13,29 @@ 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
>-TEST_BINARIES=test-service test-names test-shell-service shell-test spawn-test test-segfault test-exit test-sleep-forever
>+TEST_BINARIES = \
>+	shell-test \
>+	spawn-test \
>+	test-exit \
>+	test-names \
>+	test-segfault \
>+	test-service \
>+	test-shell-service \
>+	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
>-else
>+TESTS = \
>+	shell-test \
>+	$(NULL)
>+
>+else !DBUS_BUILD_TESTS
>+
> TEST_BINARIES=
> TESTS=
>-endif
>+
>+endif !DBUS_BUILD_TESTS
> 
> noinst_PROGRAMS= $(TEST_BINARIES)
> 
>-- 
>1.7.5.3
>

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.