Skip to contentSkip to conversation

Fix: make check in out of tree build

PATCH Mathieu Desnoyers 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]

Mathieu Desnoyers

author Applied
#1 lore raw

Merged into master, thanks!

Mathieu

Quoted 78 lines · ----- On Sep 3, 2015, at 4:11 PM, Michael Jeanson [email protected] wrote:

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.

---

.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

.gitignore +0 -0
index b1f985b..41966c5 100644
@@ -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

tests/ust-elf/Makefile.am +6 -16
index 3cb5442..368e427 100644
@@ -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 $@
tests/ust-elf/test_ust_elf deleted +0 -4
deleted file mode 100755
index cb7c7a9..0000000
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-TEST_DIR=$(dirname $0)
-./${TEST_DIR}/prog $TEST_DIR
tests/ust-elf/test_ust_elf.in new file +4 -1
new file mode 100755
index 0000000..5cfbff6
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+TEST_DIR=$(dirname $0)
+./${TEST_DIR}/prog $TEST_DIR/@TOPSRCDIR@/tests/ust-elf
--

1.9.1

Signature · 3 lines
Mathieu Desnoyers
EfficiOS Inc.
http://www.efficios.com