From 84be346be700f903998c0f1ec0130bdc9291761c Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Wed, 10 Feb 2016 11:25:33 -0500 Subject: [PATCH] Fix out-of-tree tests: seek tests can't find traces MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémie Galarneau --- configure.ac | 2 ++ tests/lib/Makefile.am | 1 + tests/lib/{test_seek_big_trace => test_seek_big_trace.in} | 3 ++- .../lib/{test_seek_empty_packet => test_seek_empty_packet.in} | 3 ++- 4 files changed, 7 insertions(+), 2 deletions(-) rename tests/lib/{test_seek_big_trace => test_seek_big_trace.in} (87%) rename tests/lib/{test_seek_empty_packet => test_seek_empty_packet.in} (88%) diff --git a/configure.ac b/configure.ac index 0851f63a..f760d4ec 100644 --- a/configure.ac +++ b/configure.ac @@ -295,4 +295,6 @@ AC_CONFIG_FILES([ babeltrace.pc babeltrace-ctf.pc ]) +AC_CONFIG_FILES([tests/lib/test_seek_big_trace], [chmod +x tests/lib/test_seek_big_trace]) +AC_CONFIG_FILES([tests/lib/test_seek_empty_packet], [chmod +x tests/lib/test_seek_empty_packet]) AC_OUTPUT diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am index 8fe4a150..1f3f5c9e 100644 --- a/tests/lib/Makefile.am +++ b/tests/lib/Makefile.am @@ -29,6 +29,7 @@ test_ctf_writer_SOURCES = test_ctf_writer.c SCRIPT_LIST = test_seek_big_trace \ test_seek_empty_packet \ test_ctf_writer_complete +EXTRA_DIST = test_seek_big_trace.in test_seek_empty_packet.in if ENABLE_DEBUGINFO test_dwarf_LDFLAGS = -static diff --git a/tests/lib/test_seek_big_trace b/tests/lib/test_seek_big_trace.in similarity index 87% rename from tests/lib/test_seek_big_trace rename to tests/lib/test_seek_big_trace.in index e56ccea2..a6e5b08f 100755 --- a/tests/lib/test_seek_big_trace +++ b/tests/lib/test_seek_big_trace.in @@ -1,6 +1,7 @@ #!/bin/bash # # Copyright (C) 2013 - Christian Babeux +# Copyright (C) 2016 - Jérémie Galarneau # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -18,6 +19,6 @@ # CURDIR=$(dirname $0)/ TESTDIR=$CURDIR/../ -CTF_TRACES=$TESTDIR/ctf-traces +CTF_TRACES=@abs_top_srcdir@/tests/ctf-traces $CURDIR/test_seek $CTF_TRACES/succeed/lttng-modules-2.0-pre5/ 61334174524234 61336381998396 diff --git a/tests/lib/test_seek_empty_packet b/tests/lib/test_seek_empty_packet.in similarity index 88% rename from tests/lib/test_seek_empty_packet rename to tests/lib/test_seek_empty_packet.in index 079ffa56..8968c590 100755 --- a/tests/lib/test_seek_empty_packet +++ b/tests/lib/test_seek_empty_packet.in @@ -1,6 +1,7 @@ #!/bin/bash # # Copyright (C) 2013 - Christian Babeux +# Copyright (C) 2016 - Jérémie Galarneau # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License @@ -18,6 +19,6 @@ # CURDIR=$(dirname $0)/ TESTDIR=$CURDIR/../ -CTF_TRACES=$TESTDIR/ctf-traces +CTF_TRACES=@abs_top_srcdir@/tests/ctf-traces $CURDIR/test_seek $CTF_TRACES/succeed/wk-heartbeat-u/ 1351532897586558519 1351532897591331194 -- 2.34.1