From bb01c30e0db3a28260239f63bc65d08825d24931 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Thu, 28 Apr 2016 16:15:14 -0400 Subject: [PATCH] Cleanup test scripts MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Michael Jeanson Signed-off-by: Jérémie Galarneau --- tests/lib/test_bin_info_complete.in | 4 ++-- tests/lib/test_ctf_writer_complete.in | 7 ++++--- tests/lib/test_dwarf_complete.in | 4 ++-- tests/lib/test_seek_big_trace.in | 7 +++---- tests/lib/test_seek_empty_packet.in | 7 +++---- 5 files changed, 14 insertions(+), 15 deletions(-) diff --git a/tests/lib/test_bin_info_complete.in b/tests/lib/test_bin_info_complete.in index 80c1e90c..bcf4be2d 100755 --- a/tests/lib/test_bin_info_complete.in +++ b/tests/lib/test_bin_info_complete.in @@ -17,6 +17,6 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # -DEBUGINFO_DATA=@abs_top_srcdir@/tests/debuginfo-data +DEBUGINFO_DATA="@abs_top_srcdir@/tests/debuginfo-data" -@abs_top_builddir@/tests/lib/test_bin_info $DEBUGINFO_DATA +"@abs_top_builddir@/tests/lib/test_bin_info" "$DEBUGINFO_DATA" diff --git a/tests/lib/test_ctf_writer_complete.in b/tests/lib/test_ctf_writer_complete.in index 4e2a4650..5bd1c97f 100755 --- a/tests/lib/test_ctf_writer_complete.in +++ b/tests/lib/test_ctf_writer_complete.in @@ -16,7 +16,8 @@ # 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 +CTFPARSERTEST="@abs_top_builddir@/formats/ctf/metadata/ctf-parser-test" +BTBIN="@abs_top_builddir@/converter/babeltrace" + +"@abs_top_builddir@/tests/lib/test_ctf_writer" "$CTFPARSERTEST" "$BTBIN" diff --git a/tests/lib/test_dwarf_complete.in b/tests/lib/test_dwarf_complete.in index bca5a853..d5b94f6c 100755 --- a/tests/lib/test_dwarf_complete.in +++ b/tests/lib/test_dwarf_complete.in @@ -17,6 +17,6 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # -DEBUGINFO_DATA=@abs_top_srcdir@/tests/debuginfo-data +DEBUGINFO_DATA="@abs_top_srcdir@/tests/debuginfo-data" -@abs_top_builddir@/tests/lib/test_dwarf $DEBUGINFO_DATA +"@abs_top_builddir@/tests/lib/test_dwarf" "$DEBUGINFO_DATA" diff --git a/tests/lib/test_seek_big_trace.in b/tests/lib/test_seek_big_trace.in index a6e5b08f..394769cb 100755 --- a/tests/lib/test_seek_big_trace.in +++ b/tests/lib/test_seek_big_trace.in @@ -17,8 +17,7 @@ # 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 +CTF_TRACES="@abs_top_srcdir@/tests/ctf-traces" + +"@abs_top_builddir@/tests/lib/test_seek" "$CTF_TRACES/succeed/lttng-modules-2.0-pre5/" 61334174524234 61336381998396 diff --git a/tests/lib/test_seek_empty_packet.in b/tests/lib/test_seek_empty_packet.in index 8968c590..006938ea 100755 --- a/tests/lib/test_seek_empty_packet.in +++ b/tests/lib/test_seek_empty_packet.in @@ -17,8 +17,7 @@ # 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 +CTF_TRACES="@abs_top_srcdir@/tests/ctf-traces" + +"@abs_top_builddir@/tests/lib/test_seek" "$CTF_TRACES/succeed/wk-heartbeat-u/" 1351532897586558519 1351532897591331194 -- 2.34.1