X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fplugins%2Fflt.utils.trimmer%2Ftest_trimming;h=cf83a7809996de2e5f1a7b784925f446a43820e0;hb=065509d3bd9342344f5c163705c64cbfbbd39af5;hp=1dbb72e7229183b058b5e04cf643dd90344a64b8;hpb=53cc240b958d74a423d0f22752c080f4e3a986db;p=babeltrace.git

diff --git a/tests/plugins/flt.utils.trimmer/test_trimming b/tests/plugins/flt.utils.trimmer/test_trimming
index 1dbb72e7..cf83a780 100755
--- a/tests/plugins/flt.utils.trimmer/test_trimming
+++ b/tests/plugins/flt.utils.trimmer/test_trimming
@@ -27,11 +27,12 @@ else
 	UTILSSH="$(dirname "$0")/../../utils/utils.sh"
 fi
 
-# shellcheck source=../../../utils/utils.sh
+# shellcheck source=../../utils/utils.sh
 source "$UTILSSH"
 
-data_dir="$BT_TESTS_SRCDIR/data/plugins/flt.utils.trimmer"
-temp_expected=$(mktemp)
+data_dir="$BT_TESTS_DATADIR/plugins/flt.utils.trimmer"
+temp_stdout_expected=$(mktemp)
+temp_stderr_expected="/dev/null"
 
 plan_tests 32
 
@@ -39,26 +40,36 @@ function run_test
 {
 	local begin_time="$1"
 	local end_time="$2"
+	# with_stream_msgs_cs is set to "true" or "false" by the tests.
+	local local_args=(
+		"--plugin-path" "$data_dir"
+		"-c" "src.test-trimmer.TheSourceOfAllEvil"
+		"-p" "with-stream-msgs-cs=$with_stream_msgs_cs"
+		"-c" "sink.text.details"
+		"--params=compact=true,with-metadata=false"
+	)
+
+	if [ "$with_stream_msgs_cs" = "true" ]; then
+		test_name="with stream message clock snapshots"
+	else
+		test_name="without stream message clock snapshots"
+	fi
 
 	if [ -n "$begin_time" ]; then
-		begin="--begin=$begin_time"
-		test_name="with $begin"
+		local_args+=("--begin=$begin_time")
+		test_name="$test_name, with --begin=$begin_time"
 	else
-		begin=""
-		test_name="without --begin"
+		test_name="$test_name, without --begin"
 	fi
 
 	if [ -n "$end_time" ]; then
-		end="--end=$end_time"
-		test_name="$test_name, with $end"
+		local_args+=("--end=$end_time")
+		test_name="$test_name, with --end=$end_time"
 	else
-		end=""
 		test_name="$test_name, without --end"
 	fi
 
-	# with_stream_msgs_cs is set to "true" or "false" by the tests.
-
-	bt_diff_cli "$temp_expected" -c src.test-trimmer.TheSourceOfAllEvil -p with-stream-msgs-cs=$with_stream_msgs_cs -c sink.text.details --params=compact=true,with-metadata=false --plugin-path=$data_dir $begin $end
+	bt_diff_cli "$temp_stdout_expected" "$temp_stderr_expected" "${local_args[@]}"
 	ok $? "$test_name"
 }
 
@@ -66,7 +77,7 @@ function test_with_stream_msg_cs {
 	with_stream_msgs_cs="true"
 
 	# Baseline (without trimming)
-	cat <<- 'END' > $temp_expected
+	cat <<- 'END' > "$temp_stdout_expected"
 	[100 10,100,000,000,000] {0 0 0} Stream beginning
 	[200 10,200,000,000,000] {0 0 0} Packet beginning
 	[300 10,300,000,000,000] {0 0 0} Event `event 1` (0)
@@ -77,7 +88,7 @@ function test_with_stream_msg_cs {
 	run_test "" ""
 
 	# Trim begin at a time before what the clock class can represent
-	cat <<- 'END' > $temp_expected
+	cat <<- 'END' > "$temp_stdout_expected"
 	[100 10,100,000,000,000] {0 0 0} Stream beginning
 	[200 10,200,000,000,000] {0 0 0} Packet beginning
 	[300 10,300,000,000,000] {0 0 0} Event `event 1` (0)
@@ -88,7 +99,7 @@ function test_with_stream_msg_cs {
 	run_test 50 ""
 
 	# Trim begin before stream beginning
-	cat <<- 'END' > $temp_expected
+	cat <<- 'END' > "$temp_stdout_expected"
 	[100 10,100,000,000,000] {0 0 0} Stream beginning
 	[200 10,200,000,000,000] {0 0 0} Packet beginning
 	[300 10,300,000,000,000] {0 0 0} Event `event 1` (0)
@@ -99,7 +110,7 @@ function test_with_stream_msg_cs {
 	run_test 10050 ""
 
 	# Trim begin before packet beginning
-	cat <<- 'END' > $temp_expected
+	cat <<- 'END' > "$temp_stdout_expected"
 	[150 10,150,000,000,000] {0 0 0} Stream beginning
 	[200 10,200,000,000,000] {0 0 0} Packet beginning
 	[300 10,300,000,000,000] {0 0 0} Event `event 1` (0)
@@ -110,7 +121,7 @@ function test_with_stream_msg_cs {
 	run_test 10150 ""
 
 	# Trim begin before first event
-	cat <<- 'END' > $temp_expected
+	cat <<- 'END' > "$temp_stdout_expected"
 	[250 10,250,000,000,000] {0 0 0} Stream beginning
 	[250 10,250,000,000,000] {0 0 0} Packet beginning
 	[300 10,300,000,000,000] {0 0 0} Event `event 1` (0)
@@ -121,7 +132,7 @@ function test_with_stream_msg_cs {
 	run_test 10250 ""
 
 	# Trim begin before second event
-	cat <<- 'END' > $temp_expected
+	cat <<- 'END' > "$temp_stdout_expected"
 	[350 10,350,000,000,000] {0 0 0} Stream beginning
 	[350 10,350,000,000,000] {0 0 0} Packet beginning
 	[400 10,400,000,000,000] {0 0 0} Event `event 2` (1)
@@ -132,7 +143,7 @@ function test_with_stream_msg_cs {
 	run_test 10350 ""
 
 	# Trim begin before packet end
-	cat <<- 'END' > $temp_expected
+	cat <<- 'END' > "$temp_stdout_expected"
 	[850 10,850,000,000,000] {0 0 0} Stream beginning
 	[850 10,850,000,000,000] {0 0 0} Packet beginning
 	[900 10,900,000,000,000] {0 0 0} Packet end
@@ -142,13 +153,13 @@ function test_with_stream_msg_cs {
 	run_test 10850 ""
 
 	# Trim begin after everything
-	cat <<- 'END' > $temp_expected
+	cat <<- 'END' > "$temp_stdout_expected"
 	END
 
 	run_test 11050 ""
 
 	# Trim end after stream end
-	cat <<- 'END' > $temp_expected
+	cat <<- 'END' > "$temp_stdout_expected"
 	[100 10,100,000,000,000] {0 0 0} Stream beginning
 	[200 10,200,000,000,000] {0 0 0} Packet beginning
 	[300 10,300,000,000,000] {0 0 0} Event `event 1` (0)
@@ -160,7 +171,7 @@ function test_with_stream_msg_cs {
 	run_test "" 11050
 
 	# Trim end after packet end
-	cat <<- 'END' > $temp_expected
+	cat <<- 'END' > "$temp_stdout_expected"
 	[100 10,100,000,000,000] {0 0 0} Stream beginning
 	[200 10,200,000,000,000] {0 0 0} Packet beginning
 	[300 10,300,000,000,000] {0 0 0} Event `event 1` (0)
@@ -172,7 +183,7 @@ function test_with_stream_msg_cs {
 	run_test "" 10950
 
 	# Trim end after second event
-	cat <<- 'END' > $temp_expected
+	cat <<- 'END' > "$temp_stdout_expected"
 	[100 10,100,000,000,000] {0 0 0} Stream beginning
 	[200 10,200,000,000,000] {0 0 0} Packet beginning
 	[300 10,300,000,000,000] {0 0 0} Event `event 1` (0)
@@ -184,7 +195,7 @@ function test_with_stream_msg_cs {
 	run_test "" 10450
 
 	# Trim end after first event
-	cat <<- 'END' > $temp_expected
+	cat <<- 'END' > "$temp_stdout_expected"
 	[100 10,100,000,000,000] {0 0 0} Stream beginning
 	[200 10,200,000,000,000] {0 0 0} Packet beginning
 	[300 10,300,000,000,000] {0 0 0} Event `event 1` (0)
@@ -195,7 +206,7 @@ function test_with_stream_msg_cs {
 	run_test "" 10350
 
 	# Trim end after packet beginning
-	cat <<- 'END' > $temp_expected
+	cat <<- 'END' > "$temp_stdout_expected"
 	[100 10,100,000,000,000] {0 0 0} Stream beginning
 	[200 10,200,000,000,000] {0 0 0} Packet beginning
 	[250 10,250,000,000,000] {0 0 0} Packet end
@@ -205,7 +216,7 @@ function test_with_stream_msg_cs {
 	run_test "" 10250
 
 	# Trim end after stream beginning
-	cat <<- 'END' > $temp_expected
+	cat <<- 'END' > "$temp_stdout_expected"
 	[100 10,100,000,000,000] {0 0 0} Stream beginning
 	[150 10,150,000,000,000] {0 0 0} Stream end
 	END
@@ -213,13 +224,13 @@ function test_with_stream_msg_cs {
 	run_test "" 10150
 
 	# Trim end before everything
-	cat <<- 'END' > $temp_expected
+	cat <<- 'END' > "$temp_stdout_expected"
 	END
 
 	run_test "" 10050
 
 	# Trim end at a time before what the clock class can represent
-	cat <<- 'END' > $temp_expected
+	cat <<- 'END' > "$temp_stdout_expected"
 	END
 
 	run_test "" 50
@@ -229,7 +240,7 @@ function test_without_stream_msg_cs {
 	with_stream_msgs_cs="false"
 
 	# Baseline (without trimming)
-	cat <<- 'END' > $temp_expected
+	cat <<- 'END' > "$temp_stdout_expected"
 	[Unknown] {0 0 0} Stream beginning
 	[200 10,200,000,000,000] {0 0 0} Packet beginning
 	[300 10,300,000,000,000] {0 0 0} Event `event 1` (0)
@@ -240,7 +251,7 @@ function test_without_stream_msg_cs {
 	run_test "" ""
 
 	# Trim begin at a time before what the clock class can represent
-	cat <<- 'END' > $temp_expected
+	cat <<- 'END' > "$temp_stdout_expected"
 	[Unknown] {0 0 0} Stream beginning
 	[200 10,200,000,000,000] {0 0 0} Packet beginning
 	[300 10,300,000,000,000] {0 0 0} Event `event 1` (0)
@@ -251,7 +262,7 @@ function test_without_stream_msg_cs {
 	run_test 50 ""
 
 	# Trim begin before stream beginning
-	cat <<- 'END' > $temp_expected
+	cat <<- 'END' > "$temp_stdout_expected"
 	[Unknown] {0 0 0} Stream beginning
 	[200 10,200,000,000,000] {0 0 0} Packet beginning
 	[300 10,300,000,000,000] {0 0 0} Event `event 1` (0)
@@ -262,7 +273,7 @@ function test_without_stream_msg_cs {
 	run_test 10050 ""
 
 	# Trim begin before packet beginning
-	cat <<- 'END' > $temp_expected
+	cat <<- 'END' > "$temp_stdout_expected"
 	[Unknown] {0 0 0} Stream beginning
 	[200 10,200,000,000,000] {0 0 0} Packet beginning
 	[300 10,300,000,000,000] {0 0 0} Event `event 1` (0)
@@ -273,7 +284,7 @@ function test_without_stream_msg_cs {
 	run_test 10150 ""
 
 	# Trim begin before first event
-	cat <<- 'END' > $temp_expected
+	cat <<- 'END' > "$temp_stdout_expected"
 	[250 10,250,000,000,000] {0 0 0} Stream beginning
 	[250 10,250,000,000,000] {0 0 0} Packet beginning
 	[300 10,300,000,000,000] {0 0 0} Event `event 1` (0)
@@ -284,7 +295,7 @@ function test_without_stream_msg_cs {
 	run_test 10250 ""
 
 	# Trim begin before second event
-	cat <<- 'END' > $temp_expected
+	cat <<- 'END' > "$temp_stdout_expected"
 	[350 10,350,000,000,000] {0 0 0} Stream beginning
 	[350 10,350,000,000,000] {0 0 0} Packet beginning
 	[400 10,400,000,000,000] {0 0 0} Event `event 2` (1)
@@ -295,7 +306,7 @@ function test_without_stream_msg_cs {
 	run_test 10350 ""
 
 	# Trim begin before packet end
-	cat <<- 'END' > $temp_expected
+	cat <<- 'END' > "$temp_stdout_expected"
 	[850 10,850,000,000,000] {0 0 0} Stream beginning
 	[850 10,850,000,000,000] {0 0 0} Packet beginning
 	[900 10,900,000,000,000] {0 0 0} Packet end
@@ -305,13 +316,13 @@ function test_without_stream_msg_cs {
 	run_test 10850 ""
 
 	# Trim begin after everything
-	cat <<- 'END' > $temp_expected
+	cat <<- 'END' > "$temp_stdout_expected"
 	END
 
 	run_test 11050 ""
 
 	# Trim end after stream end
-	cat <<- 'END' > $temp_expected
+	cat <<- 'END' > "$temp_stdout_expected"
 	[Unknown] {0 0 0} Stream beginning
 	[200 10,200,000,000,000] {0 0 0} Packet beginning
 	[300 10,300,000,000,000] {0 0 0} Event `event 1` (0)
@@ -323,7 +334,7 @@ function test_without_stream_msg_cs {
 	run_test "" 11050
 
 	# Trim end after packet end
-	cat <<- 'END' > $temp_expected
+	cat <<- 'END' > "$temp_stdout_expected"
 	[Unknown] {0 0 0} Stream beginning
 	[200 10,200,000,000,000] {0 0 0} Packet beginning
 	[300 10,300,000,000,000] {0 0 0} Event `event 1` (0)
@@ -335,7 +346,7 @@ function test_without_stream_msg_cs {
 	run_test "" 10950
 
 	# Trim end after second event
-	cat <<- 'END' > $temp_expected
+	cat <<- 'END' > "$temp_stdout_expected"
 	[Unknown] {0 0 0} Stream beginning
 	[200 10,200,000,000,000] {0 0 0} Packet beginning
 	[300 10,300,000,000,000] {0 0 0} Event `event 1` (0)
@@ -347,7 +358,7 @@ function test_without_stream_msg_cs {
 	run_test "" 10450
 
 	# Trim end after first event
-	cat <<- 'END' > $temp_expected
+	cat <<- 'END' > "$temp_stdout_expected"
 	[Unknown] {0 0 0} Stream beginning
 	[200 10,200,000,000,000] {0 0 0} Packet beginning
 	[300 10,300,000,000,000] {0 0 0} Event `event 1` (0)
@@ -358,7 +369,7 @@ function test_without_stream_msg_cs {
 	run_test "" 10350
 
 	# Trim end after packet beginning
-	cat <<- 'END' > $temp_expected
+	cat <<- 'END' > "$temp_stdout_expected"
 	[Unknown] {0 0 0} Stream beginning
 	[200 10,200,000,000,000] {0 0 0} Packet beginning
 	[250 10,250,000,000,000] {0 0 0} Packet end
@@ -368,7 +379,7 @@ function test_without_stream_msg_cs {
 	run_test "" 10250
 
 	# Trim end after stream beginning
-	cat <<- 'END' > $temp_expected
+	cat <<- 'END' > "$temp_stdout_expected"
 	[Unknown] {0 0 0} Stream beginning
 	[Unknown] {0 0 0} Stream end
 	END
@@ -376,7 +387,7 @@ function test_without_stream_msg_cs {
 	run_test "" 10150
 
 	# Trim end before everything
-	cat <<- 'END' > $temp_expected
+	cat <<- 'END' > "$temp_stdout_expected"
 	[Unknown] {0 0 0} Stream beginning
 	[Unknown] {0 0 0} Stream end
 	END
@@ -384,7 +395,7 @@ function test_without_stream_msg_cs {
 	run_test "" 10050
 
 	# Trim end at a time before what the clock class can represent
-	cat <<- 'END' > $temp_expected
+	cat <<- 'END' > "$temp_stdout_expected"
 	[Unknown] {0 0 0} Stream beginning
 	[Unknown] {0 0 0} Stream end
 	END
@@ -395,4 +406,6 @@ function test_without_stream_msg_cs {
 test_with_stream_msg_cs
 test_without_stream_msg_cs
 
-rm -f "$temp_expected"
+# Do not `rm` $temp_stderr_expected because it's set to `/dev/null` right now
+# and that would print an error.
+rm -f "$temp_stdout_expected"