Cleanup test scripts

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

diff --git a/tests/lib/test_bin_info_complete.in b/tests/lib/test_bin_info_complete.in
index 80c1e90ce93882094fe92a40ebb23b90d7153534..bcf4be2d49c7ffc711e373481fe365146832253d 100755 (executable)
--- 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 4e2a4650a2840ee2b5bda61fddffc8ca910132af..5bd1c97f24e0a2aa9669a72bb8e2cb5f40f20616 100755 (executable)
--- 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 bca5a853c837f76077d94ef3d140194e4cf8fbc0..d5b94f6cb9f28559b2105d8020c797e6f27e9485 100755 (executable)
--- 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 a6e5b08f8c90f2308d73dee22a63b9bf0df065b6..394769cb000ec71ca2f1a802b5afc50f2d5981df 100755 (executable)
--- 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 8968c5900f59b6ba1fa5025cacb7b8c3f0ad603b..006938ea49022cf73eb8c1c134f5c7db596b6124 100755 (executable)
--- 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