From fd6533cbcf36eebce6040a3b6f0044eac6d93fb9 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Thu, 3 Sep 2015 14:13:21 -0400 Subject: [PATCH] Fix: make check in out of tree build MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Use the tracefiles from the source dir when running make check in an out of tree builddir. Signed-off-by: Michael Jeanson Signed-off-by: Jérémie Galarneau --- .gitignore | 1 + tests/bin/Makefile.am | 22 +++++-------------- .../{test_trace_read => test_trace_read.in} | 2 +- 3 files changed, 8 insertions(+), 17 deletions(-) rename tests/bin/{test_trace_read => test_trace_read.in} (96%) diff --git a/.gitignore b/.gitignore index 40f9283f..65ab8fe3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ *~ +/tests/bin/test_trace_read /tests/lib/test_bitfield /tests/lib/test_seek /tests/lib/test_ctf_writer diff --git a/tests/bin/Makefile.am b/tests/bin/Makefile.am index e46285fb..0245238c 100644 --- a/tests/bin/Makefile.am +++ b/tests/bin/Makefile.am @@ -1,17 +1,7 @@ -SCRIPT_LIST = test_trace_read +noinst_SCRIPTS = test_trace_read +CLEANFILES = $(noinst_SCRIPTS) +EXTRA_DIST = test_trace_read.in -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/bin/test_trace_read b/tests/bin/test_trace_read.in similarity index 96% rename from tests/bin/test_trace_read rename to tests/bin/test_trace_read.in index b80ca956..f9410e55 100755 --- a/tests/bin/test_trace_read +++ b/tests/bin/test_trace_read.in @@ -20,7 +20,7 @@ TESTDIR=$CURDIR/.. BABELTRACE_BIN=$CURDIR/../../converter/babeltrace -CTF_TRACES=$TESTDIR/ctf-traces +CTF_TRACES=$CURDIR/@TOPSRCDIR@/tests/ctf-traces source $TESTDIR/utils/tap/tap.sh -- 2.34.1