[lttng-dev] [PATCH babeltrace] Fix: make check in OOT build with absolute path

[Jérémie Galarneau]

Merged in both master and stable-1.2.

Thanks!
Jérémie

On Fri, Sep 4, 2015 at 5:23 PM, Michael Jeanson <mjeanson at efficios.com> wrote:
> The previous patch fixed the out of tree build when the configure script
> was called with a path relative to the builddir but still failed when
> the path was absolute. This works with both.
>
> Signed-off-by: Michael Jeanson <mjeanson at efficios.com>
> ---
>  tests/bin/Makefile.am        | 2 +-
>  tests/bin/test_trace_read.in | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tests/bin/Makefile.am b/tests/bin/Makefile.am
> index 0245238..086919b 100644
> --- a/tests/bin/Makefile.am
> +++ b/tests/bin/Makefile.am
> @@ -3,5 +3,5 @@ CLEANFILES = $(noinst_SCRIPTS)
>  EXTRA_DIST = test_trace_read.in
>
>  $(noinst_SCRIPTS): %: %.in
> -       sed "s#@TOPSRCDIR@#$(top_srcdir)#g" < $< > $@
> +       sed "s#@ABSTOPSRCDIR@#$(abs_top_srcdir)#g" < $< > $@
>         chmod +x $@
> diff --git a/tests/bin/test_trace_read.in b/tests/bin/test_trace_read.in
> index f9410e5..761fd05 100755
> --- a/tests/bin/test_trace_read.in
> +++ b/tests/bin/test_trace_read.in
> @@ -20,7 +20,7 @@ TESTDIR=$CURDIR/..
>
>  BABELTRACE_BIN=$CURDIR/../../converter/babeltrace
>
> -CTF_TRACES=$CURDIR/@TOPSRCDIR@/tests/ctf-traces
> +CTF_TRACES=@ABSTOPSRCDIR@/tests/ctf-traces
>
>  source $TESTDIR/utils/tap/tap.sh
>
> --
> 1.9.1
>



-- 
Jérémie Galarneau
EfficiOS Inc.
http://www.efficios.com