Use the elf data files from the source dir when running make check in an
out of tree builddir and add the data files to dist.
Signed-off-by: Michael Jeanson <mjean...@efficios.com>
---
.gitignore | 1 +
tests/ust-elf/Makefile.am | 22 ++++++----------------
tests/ust-elf/test_ust_elf | 4 ----
tests/ust-elf/test_ust_elf.in | 4 ++++
4 files changed, 11 insertions(+), 20 deletions(-)
delete mode 100755 tests/ust-elf/test_ust_elf
create mode 100755 tests/ust-elf/test_ust_elf.in
diff --git a/.gitignore b/.gitignore
index b1f985b..41966c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,6 +50,7 @@ tests/tracepoint/benchmark/tracepoint_benchmark
tests/tracepoint/tracepoint_test
tests/snprintf/prog
tests/ust-elf/prog
+tests/ust-elf/test_ust_elf
tests/benchmark/bench1
tests/benchmark/bench2
diff --git a/tests/ust-elf/Makefile.am b/tests/ust-elf/Makefile.am
index 3cb5442..368e427 100644
--- a/tests/ust-elf/Makefile.am
+++ b/tests/ust-elf/Makefile.am
@@ -5,20 +5,10 @@ prog_SOURCES = prog.c
prog_LDADD = $(top_builddir)/liblttng-ust/liblttng-ust.la \
$(top_builddir)/tests/utils/libtap.a
-SCRIPT_LIST = test_ust_elf
+noinst_SCRIPTS = test_ust_elf
+CLEANFILES = $(noinst_SCRIPTS)
+EXTRA_DIST = test_ust_elf.in $(srcdir)/data/**
-dist_noinst_SCRIPTS = $(SCRIPT_LIST)
-
-all-local:
- @if [ x"$(srcdir)" != x"$(builddir)" ]; then \
- for script in $(SCRIPT_LIST); do \
- cp -f $(srcdir)/$$script $(builddir); \
- done; \
- fi
-
-clean-local:
- @if [ x"$(srcdir)" != x"$(builddir)" ]; then \
- for script in $(SCRIPT_LIST); do \
- rm -f $(builddir)/$$script; \
- done; \
- fi
+$(noinst_SCRIPTS): %: %.in
+ sed "s#@TOPSRCDIR@#$(top_srcdir)#g" < $< > $@
+ chmod +x $@
diff --git a/tests/ust-elf/test_ust_elf b/tests/ust-elf/test_ust_elf
deleted file mode 100755
index cb7c7a9..0000000
--- a/tests/ust-elf/test_ust_elf
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-TEST_DIR=$(dirname $0)
-./${TEST_DIR}/prog $TEST_DIR
diff --git a/tests/ust-elf/test_ust_elf.in b/tests/ust-elf/test_ust_elf.in
new file mode 100755
index 0000000..5cfbff6
--- /dev/null
+++ b/tests/ust-elf/test_ust_elf.in
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+TEST_DIR=$(dirname $0)
+./${TEST_DIR}/prog $TEST_DIR/@TOPSRCDIR@/tests/ust-elf
--
1.9.1
_______________________________________________
lttng-dev mailing list
lttng-dev@lists.lttng.org
http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
