Fix out-of-tree tests: seek tests can't find traces

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/configure.ac b/configure.ac
index 0851f63ac12168b0c745a64e8f192da3dc0f9662..f760d4ece50e6d8f7398022919086d7bb769d4dc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -295,4 +295,6 @@ AC_CONFIG_FILES([
        babeltrace.pc
        babeltrace-ctf.pc
 ])
        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
 AC_OUTPUT

diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am
index 8fe4a15002552e852c290494be638a5b6681df2e..1f3f5c9e6d1e77b57b6e8d8d48d972a97cfaf765 100644 (file)
--- 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
 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
 
 if ENABLE_DEBUGINFO
 test_dwarf_LDFLAGS = -static

diff --git a/tests/lib/test_seek_big_trace b/tests/lib/test_seek_big_trace
deleted file mode 100755 (executable)
index e56ccea..0000000
--- a/tests/lib/test_seek_big_trace
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2013 - Christian Babeux <christian.babeux@efficios.com>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; only version 2
-# of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-CURDIR=$(dirname $0)/
-TESTDIR=$CURDIR/../
-CTF_TRACES=$TESTDIR/ctf-traces
-
-$CURDIR/test_seek $CTF_TRACES/succeed/lttng-modules-2.0-pre5/ 61334174524234 61336381998396

diff --git a/tests/lib/test_seek_big_trace.in b/tests/lib/test_seek_big_trace.in
new file mode 100755 (executable)
index 0000000..a6e5b08
--- /dev/null
+++ b/tests/lib/test_seek_big_trace.in
@@ -0,0 +1,24 @@
+#!/bin/bash
+#
+# Copyright (C) 2013 - Christian Babeux <christian.babeux@efficios.com>
+# Copyright (C) 2016 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; only version 2
+# of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+CURDIR=$(dirname $0)/
+TESTDIR=$CURDIR/../
+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
deleted file mode 100755 (executable)
index 079ffa5..0000000
--- a/tests/lib/test_seek_empty_packet
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2013 - Christian Babeux <christian.babeux@efficios.com>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; only version 2
-# of the License.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-#
-CURDIR=$(dirname $0)/
-TESTDIR=$CURDIR/../
-CTF_TRACES=$TESTDIR/ctf-traces
-
-$CURDIR/test_seek $CTF_TRACES/succeed/wk-heartbeat-u/ 1351532897586558519 1351532897591331194

diff --git a/tests/lib/test_seek_empty_packet.in b/tests/lib/test_seek_empty_packet.in
new file mode 100755 (executable)
index 0000000..8968c59
--- /dev/null
+++ b/tests/lib/test_seek_empty_packet.in
@@ -0,0 +1,24 @@
+#!/bin/bash
+#
+# Copyright (C) 2013 - Christian Babeux <christian.babeux@efficios.com>
+# Copyright (C) 2016 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; only version 2
+# of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+CURDIR=$(dirname $0)/
+TESTDIR=$CURDIR/../
+CTF_TRACES=@abs_top_srcdir@/tests/ctf-traces
+
+$CURDIR/test_seek $CTF_TRACES/succeed/wk-heartbeat-u/ 1351532897586558519 1351532897591331194