Skip to contentSkip to conversation

Fix: make check in OOT build with absolute path

PATCH Jérémie Galarneau 1 participant 1 message Sep 4, 2015 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

Merged in both master and stable-1.2.

Thanks!
Jérémie

Quoted 37 lines · Michael Jeanson

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.

---
 tests/bin/Makefile.am        | 2 +-
 tests/bin/test_trace_read.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
tests/bin/Makefile.am +1 -1
index 0245238..086919b 100644
@@ -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 $@
tests/bin/test_trace_read.in +1 -2
index f9410e5..761fd05 100755
@@ -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

Signature · 8 lines
Jérémie Galarneau
EfficiOS Inc.
http://www.efficios.com

_______________________________________________
lttng-dev mailing list
[email protected]
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev