From: Jérémie Galarneau Date: Wed, 10 Feb 2016 16:25:33 +0000 (-0500) Subject: Fix out-of-tree tests: seek tests can't find traces X-Git-Tag: v1.4.0-rc1~70 X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=84be346be700f903998c0f1ec0130bdc9291761c Fix out-of-tree tests: seek tests can't find traces Signed-off-by: Jérémie Galarneau --- 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 deleted file mode 100755 index e56ccea2..00000000 --- a/tests/lib/test_seek_big_trace +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -# -# Copyright (C) 2013 - Christian Babeux -# -# 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 index 00000000..a6e5b08f --- /dev/null +++ b/tests/lib/test_seek_big_trace.in @@ -0,0 +1,24 @@ +#!/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 +# 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 index 079ffa56..00000000 --- a/tests/lib/test_seek_empty_packet +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -# -# Copyright (C) 2013 - Christian Babeux -# -# 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 index 00000000..8968c590 --- /dev/null +++ b/tests/lib/test_seek_empty_packet.in @@ -0,0 +1,24 @@ +#!/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 +# 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