X-Git-Url: https://git.efficios.com/?a=blobdiff_plain;f=tests%2Fplugins%2Fflt.utils.trimmer%2Ftest_trimming;h=5f84bf1b7fa38dead45223d167c25a636dda2dea;hb=58db335ee64dfdedc0e351fd8e1524e7ca381896;hp=3ec05a4115ecbb976201259c56c39a3fa45970ba;hpb=f30bb42350a15a626d5798bcdbddaf71a3f8e876;p=babeltrace.git

diff --git a/tests/plugins/flt.utils.trimmer/test_trimming b/tests/plugins/flt.utils.trimmer/test_trimming
index 3ec05a41..5f84bf1b 100755
--- a/tests/plugins/flt.utils.trimmer/test_trimming
+++ b/tests/plugins/flt.utils.trimmer/test_trimming
@@ -31,7 +31,8 @@ fi
 source "$UTILSSH"
 
 data_dir="$BT_TESTS_DATADIR/plugins/flt.utils.trimmer"
-temp_expected=$(mktemp)
+temp_stdout_expected=$(mktemp)
+temp_stderr_expected="/dev/null"
 
 plan_tests 32
 
@@ -63,7 +64,7 @@ function run_test
 
 	# with_stream_msgs_cs is set to "true" or "false" by the tests.
 
-	bt_diff_cli "$temp_expected" "${local_args[@]}"
+	bt_diff_cli "$temp_stdout_expected" "$temp_stderr_expected" "${local_args[@]}"
 	ok $? "$test_name"
 }
 
@@ -71,7 +72,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)
@@ -82,7 +83,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)
@@ -93,7 +94,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)
@@ -104,7 +105,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)
@@ -115,7 +116,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)
@@ -126,7 +127,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)
@@ -137,7 +138,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
@@ -147,13 +148,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)
@@ -165,7 +166,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)
@@ -177,7 +178,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)
@@ -189,7 +190,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)
@@ -200,7 +201,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
@@ -210,7 +211,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
@@ -218,13 +219,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
@@ -234,7 +235,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)
@@ -245,7 +246,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)
@@ -256,7 +257,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)
@@ -267,7 +268,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)
@@ -278,7 +279,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)
@@ -289,7 +290,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)
@@ -300,7 +301,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
@@ -310,13 +311,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)
@@ -328,7 +329,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)
@@ -340,7 +341,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)
@@ -352,7 +353,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)
@@ -363,7 +364,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
@@ -373,7 +374,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
@@ -381,7 +382,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
@@ -389,7 +390,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
@@ -400,4 +401,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"