From: Michael Jeanson <mjeanson@efficios.com>
Date: Thu, 14 Apr 2016 11:55:06 +0000 (-0400)
Subject: Tests: Use AC_CONFIG_FILES to generate test scripts
X-Git-Tag: v1.4.0-rc1~69
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=fcacebd50509eb8ec88d182a983f9c4227f32c4c

Tests: Use AC_CONFIG_FILES to generate test scripts

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

diff --git a/configure.ac b/configure.ac
index f760d4ec..fd74535e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -295,6 +295,11 @@ 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_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])
+
 AC_OUTPUT
diff --git a/tests/bin/Makefile.am b/tests/bin/Makefile.am
index 2bf94246..ae9eba80 100644
--- a/tests/bin/Makefile.am
+++ b/tests/bin/Makefile.am
@@ -1,7 +1,2 @@
 noinst_SCRIPTS = test_trace_read test_intersection test_packet_seq_num
 CLEANFILES = $(noinst_SCRIPTS)
-EXTRA_DIST = test_trace_read.in test_intersection.in test_packet_seq_num.in
-
-$(noinst_SCRIPTS): %: %.in
-	sed "s#@ABSTOPSRCDIR@#$(abs_top_srcdir)#g" < $< > $@
-	chmod +x $@
diff --git a/tests/bin/test_intersection.in b/tests/bin/test_intersection.in
index 28cb58a4..82eac235 100644
--- a/tests/bin/test_intersection.in
+++ b/tests/bin/test_intersection.in
@@ -19,7 +19,7 @@ CURDIR=$(dirname $0)
 TESTDIR=$CURDIR/..
 
 BABELTRACE_BIN=$CURDIR/../../converter/babeltrace
-CTF_TRACES=@ABSTOPSRCDIR@/tests/ctf-traces
+CTF_TRACES=@abs_top_srcdir@/tests/ctf-traces
 
 source $TESTDIR/utils/tap/tap.sh
 
diff --git a/tests/bin/test_packet_seq_num.in b/tests/bin/test_packet_seq_num.in
index 3348a4c7..e8e291cb 100644
--- a/tests/bin/test_packet_seq_num.in
+++ b/tests/bin/test_packet_seq_num.in
@@ -19,7 +19,7 @@ CURDIR=$(dirname $0)
 TESTDIR=$CURDIR/..
 
 BABELTRACE_BIN=$CURDIR/../../converter/babeltrace
-CTF_TRACES=@ABSTOPSRCDIR@/tests/ctf-traces
+CTF_TRACES=@abs_top_srcdir@/tests/ctf-traces
 
 source $TESTDIR/utils/tap/tap.sh
 
@@ -32,7 +32,7 @@ test_no_lost() {
 
 	$BABELTRACE_BIN $trace >/dev/null 2>&1
 	ok $? "Trace parses"
-	$BABELTRACE_BIN $trace 2>&1 >/dev/null | grep "\[warning\] Tracer lost"
+	$BABELTRACE_BIN $trace 2>&1 >/dev/null | @GREP@ "\[warning\] Tracer lost"
 	if test $? = 0; then
 		fail 1 "Should not find any lost events"
 	else
@@ -51,9 +51,9 @@ test_lost() {
 	# [warning] Tracer lost 2 trace packets between ....
 	# [warning] Tracer lost 3 trace packets between ....
 	# into "2,3" and make sure it matches the expected result
-	$BABELTRACE_BIN $trace 2>&1 >/dev/null | grep "\[warning\] Tracer lost" \
-		| cut -d" " -f4 | tr "\n" "," | sed "s/.$//" | \
-		grep "$expectedcountstr" >/dev/null
+	$BABELTRACE_BIN $trace 2>&1 >/dev/null | @GREP@ "\[warning\] Tracer lost" \
+		| cut -d" " -f4 | tr "\n" "," | @SED@ "s/.$//" | \
+		@GREP@ "$expectedcountstr" >/dev/null
 	ok $? "Lost events string matches $expectedcountstr"
 
 }
diff --git a/tests/bin/test_trace_read.in b/tests/bin/test_trace_read.in
index 761fd056..758e8ce9 100644
--- a/tests/bin/test_trace_read.in
+++ b/tests/bin/test_trace_read.in
@@ -20,7 +20,7 @@ TESTDIR=$CURDIR/..
 
 BABELTRACE_BIN=$CURDIR/../../converter/babeltrace
 
-CTF_TRACES=@ABSTOPSRCDIR@/tests/ctf-traces
+CTF_TRACES=@abs_top_srcdir@/tests/ctf-traces
 
 source $TESTDIR/utils/tap/tap.sh