From: Michael Jeanson Date: Thu, 28 Apr 2016 16:38:20 +0000 (-0400) Subject: Handle test_ctf_writer_complete like the other tests scripts X-Git-Tag: v1.4.0-rc1~36 X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=4369fbb4d54e3d880b63d20a085517150d27236a Handle test_ctf_writer_complete like the other tests scripts Even if test_ctf_writer_complete doesn't require any substitutions, handle it like the other test scripts which will be less error prone and will allow to remove all the SCRIPT_LIST custom rules. Signed-off-by: Michael Jeanson Signed-off-by: Jérémie Galarneau --- diff --git a/configure.ac b/configure.ac index b161828a..ce8c2ef9 100644 --- a/configure.ac +++ b/configure.ac @@ -303,8 +303,10 @@ AC_CONFIG_FILES([ babeltrace-ctf.pc ]) +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/bin/test_trace_read], [chmod +x tests/bin/test_trace_read]) AC_CONFIG_FILES([tests/bin/test_intersection], [chmod +x tests/bin/test_intersection]) AC_CONFIG_FILES([tests/bin/test_packet_seq_num], [chmod +x tests/bin/test_packet_seq_num]) diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am index 12febed4..f2a2f5a2 100644 --- a/tests/lib/Makefile.am +++ b/tests/lib/Makefile.am @@ -27,8 +27,8 @@ test_bitfield_SOURCES = test_bitfield.c test_ctf_writer_SOURCES = test_ctf_writer.c check_SCRIPTS = test_seek_big_trace \ - test_seek_empty_packet -SCRIPT_LIST = test_ctf_writer_complete + test_seek_empty_packet \ + test_ctf_writer_complete if ENABLE_DEBUGINFO test_dwarf_LDFLAGS = -static diff --git a/tests/lib/test_ctf_writer_complete b/tests/lib/test_ctf_writer_complete deleted file mode 100755 index 4e2a4650..00000000 --- a/tests/lib/test_ctf_writer_complete +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -# -# Copyright (C) 2013 - 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)/ -ROOTDIR=$CURDIR/../.. - -$CURDIR/test_ctf_writer $ROOTDIR/formats/ctf/metadata/ctf-parser-test $ROOTDIR/converter/babeltrace diff --git a/tests/lib/test_ctf_writer_complete.in b/tests/lib/test_ctf_writer_complete.in new file mode 100755 index 00000000..4e2a4650 --- /dev/null +++ b/tests/lib/test_ctf_writer_complete.in @@ -0,0 +1,22 @@ +#!/bin/bash +# +# Copyright (C) 2013 - 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)/ +ROOTDIR=$CURDIR/../.. + +$CURDIR/test_ctf_writer $ROOTDIR/formats/ctf/metadata/ctf-parser-test $ROOTDIR/converter/babeltrace