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

Michael Jeanson mjeanson at efficios.com
Fri Sep 4 17:31:31 EDT 2015


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/ust-elf/Makefile.am     | 2 +-
 tests/ust-elf/test_ust_elf.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/ust-elf/Makefile.am b/tests/ust-elf/Makefile.am
index 368e427..92337e7 100644
--- a/tests/ust-elf/Makefile.am
+++ b/tests/ust-elf/Makefile.am
@@ -10,5 +10,5 @@ CLEANFILES = $(noinst_SCRIPTS)
 EXTRA_DIST = test_ust_elf.in $(srcdir)/data/**
 
 $(noinst_SCRIPTS): %: %.in
-	sed "s#@TOPSRCDIR@#$(top_srcdir)#g" < $< > $@
+	sed "s#@ABSTOPSRCDIR@#$(abs_top_srcdir)#g" < $< > $@
 	chmod +x $@
diff --git a/tests/ust-elf/test_ust_elf.in b/tests/ust-elf/test_ust_elf.in
index 5cfbff6..03a995f 100755
--- a/tests/ust-elf/test_ust_elf.in
+++ b/tests/ust-elf/test_ust_elf.in
@@ -1,4 +1,4 @@
 #!/bin/bash
 
 TEST_DIR=$(dirname $0)
-./${TEST_DIR}/prog $TEST_DIR/@TOPSRCDIR@/tests/ust-elf
+./${TEST_DIR}/prog @ABSTOPSRCDIR@/tests/ust-elf
-- 
1.9.1




More information about the lttng-dev mailing list