[SSSD] [PATCH v2] build: Switch to AM_DISTCHECK_CONFIGURE_FLAGS

Lukas Slebodnik lslebodn at redhat.com
Mon May 26 15:22:12 UTC 2014


On (26/05/14 18:14), Nikolai Kondrashov wrote:
>On 05/26/2014 04:51 PM, Lukas Slebodnik wrote:
>>On (21/05/14 13:30), Nikolai Kondrashov wrote:
>>>Use AM_DISTCHECK_CONFIGURE_FLAGS in Makefile.am instead of
>>>DISTCHECK_CONFIGURE_FLAGS to allow using the latter at build time,
>>>upon making distcheck target.
>>>
>>>In particular, the above would allow specifying --with-test-dir option
>>>to help archive test data in CI runs, like this:
>>>
>>>    make distcheck DISTCHECK_CONFIGURE_FLAGS=/dev/shm/ci-test-dir
>>I think you want to write next line to the commit description
>>make distcheck DISTCHECK_CONFIGURE_FLAGS="--with-test-dir=/dev/shm/ci-test-dir"
>>
>>Otherwise works as expected.
>>
>>The configure sctipt was called with two argumets "--with-test-dir"
>>and the last one won.
>>
>>sh-4.2$ grep "$ ../configure" ./sssd-1.11.90/_build/config.log
>>   $ ../configure --srcdir=.. --prefix=/dev/shm/sssd_build/sssd-1.11.90/_inst --with-ldb-lib-dir=/dev/shm/sssd_build/sssd-1.11.90/_inst/lib/ldb --enable-all-experimental-features --with-test-dir=/dev/shm --with-test-dir=/dev/shm/ci-test-dir
>>
>>sh-4.2$ grep "TEST_DIR" ./sssd-1.11.90/_build/config.h
>>#define TEST_DIR "/dev/shm/ci-test-dir"
>>
>>ACK after small change in commit message
>
>Ah, yes, thank you. Fixed.
>
>Nick

>From 0f124522e8911f156040e746c986396b548292f9 Mon Sep 17 00:00:00 2001
>From: Nikolai Kondrashov <Nikolai.Kondrashov at redhat.com>
>Date: Tue, 20 May 2014 17:52:43 +0300
>Subject: [PATCH 1/1] build: Switch to AM_DISTCHECK_CONFIGURE_FLAGS
>
>Use AM_DISTCHECK_CONFIGURE_FLAGS in Makefile.am instead of
>DISTCHECK_CONFIGURE_FLAGS to allow using the latter at build time,
>upon making distcheck target.
>
>In particular, the above would allow specifying --with-test-dir option
>to help archive test data in CI runs, like this:
>
>    make distcheck DISTCHECK_CONFIGURE_FLAGS=--with-test-dir=/dev/shm/ci-test-dir
>---
> Makefile.am | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/Makefile.am b/Makefile.am
>index e160ea3..5f702e3 100644
>--- a/Makefile.am
>+++ b/Makefile.am
>@@ -7,9 +7,9 @@ if WITH_JOURNALD
>     extra_distcheck_flags += --with-syslog=journald
> endif
> 
>-DISTCHECK_CONFIGURE_FLAGS = --with-ldb-lib-dir="$$dc_install_base"/lib/ldb \
>-                            --enable-all-experimental-features \
>-                            $(extra_distcheck_flags)
>+AM_DISTCHECK_CONFIGURE_FLAGS = --with-ldb-lib-dir="$$dc_install_base"/lib/ldb \
>+                               --enable-all-experimental-features \
>+                               $(extra_distcheck_flags)

ACK

LS



More information about the sssd-devel mailing list