From: Simon Marchi Date: Thu, 28 Apr 2016 16:43:37 +0000 (-0400) Subject: Fix: Make test_dwarf and test_bin_info tests work out-of-tree X-Git-Url: http://git.efficios.com/?p=deliverable%2Fbabeltrace.git;a=commitdiff_plain;h=05d31afb273ebce4128dbdb16caec75a14f6b620 Fix: Make test_dwarf and test_bin_info tests work out-of-tree When building out of tree, these tests fail to find the test data. This patch makes them (their _complete wrappers, actually) generated by Autoconf, so the proper path to the test data (which is in the source directory) can be written. We can also get rid of SCRIPT_LIST and it's custom rules. Signed-off-by: Simon Marchi Signed-off-by: Michael Jeanson Signed-off-by: Jérémie Galarneau --- diff --git a/configure.ac b/configure.ac index ce8c2ef93..193504ac6 100644 --- a/configure.ac +++ b/configure.ac @@ -306,6 +306,8 @@ AC_CONFIG_FILES([ AC_CONFIG_FILES([tests/lib/test_ctf_writer_complete], [chmod +x tests/lib/test_ctf_writer_complete]) 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_CONFIG_FILES([tests/lib/test_dwarf_complete], [chmod +x tests/lib/test_dwarf_complete]) +AC_CONFIG_FILES([tests/lib/test_bin_info_complete], [chmod +x tests/lib/test_bin_info_complete]) AC_CONFIG_FILES([tests/bin/test_trace_read], [chmod +x tests/bin/test_trace_read]) AC_CONFIG_FILES([tests/bin/test_intersection], [chmod +x tests/bin/test_intersection]) diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am index f2a2f5a2d..10fd9e734 100644 --- a/tests/lib/Makefile.am +++ b/tests/lib/Makefile.am @@ -44,21 +44,5 @@ test_bin_info_LDADD = $(LIBTAP) \ test_bin_info_SOURCES = test_bin_info.c noinst_PROGRAMS += test_dwarf test_bin_info -SCRIPT_LIST += test_dwarf_complete test_bin_info_complete +check_SCRIPTS += test_dwarf_complete test_bin_info_complete endif - -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 diff --git a/tests/lib/test_bin_info_complete b/tests/lib/test_bin_info_complete deleted file mode 100755 index 0f930109f..000000000 --- a/tests/lib/test_bin_info_complete +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2015 - Antoine Busque -# -# 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)/ -ROOTDIR=$CURDIR../.. - -$CURDIR/test_bin_info $ROOTDIR/tests/debuginfo-data diff --git a/tests/lib/test_bin_info_complete.in b/tests/lib/test_bin_info_complete.in new file mode 100755 index 000000000..80c1e90ce --- /dev/null +++ b/tests/lib/test_bin_info_complete.in @@ -0,0 +1,22 @@ +#!/bin/sh +# +# Copyright (C) 2015 - Antoine Busque +# +# 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. +# + +DEBUGINFO_DATA=@abs_top_srcdir@/tests/debuginfo-data + +@abs_top_builddir@/tests/lib/test_bin_info $DEBUGINFO_DATA diff --git a/tests/lib/test_dwarf_complete b/tests/lib/test_dwarf_complete deleted file mode 100755 index c6330160d..000000000 --- a/tests/lib/test_dwarf_complete +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2015 - Antoine Busque -# -# 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)/ -ROOTDIR=$CURDIR../.. - -$CURDIR/test_dwarf $ROOTDIR/tests/debuginfo-data diff --git a/tests/lib/test_dwarf_complete.in b/tests/lib/test_dwarf_complete.in new file mode 100755 index 000000000..bca5a853c --- /dev/null +++ b/tests/lib/test_dwarf_complete.in @@ -0,0 +1,22 @@ +#!/bin/sh +# +# Copyright (C) 2015 - Antoine Busque +# +# 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. +# + +DEBUGINFO_DATA=@abs_top_srcdir@/tests/debuginfo-data + +@abs_top_builddir@/tests/lib/test_dwarf $DEBUGINFO_DATA