X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fplugins%2Fsrc.ctf.fs%2Ffail%2Ftest_fail;h=443db0c507067be9c069a3f29ad2d785ca47de9c;hb=ab003dc0397a13f72c8268c310c0559a06a87fb1;hp=7f8a9515e35436263ad8f3c3b752e9c0ab817336;hpb=29a8227a1b5d08e0b600a2575372a3b5ae232d21;p=babeltrace.git

diff --git a/tests/plugins/src.ctf.fs/fail/test_fail b/tests/plugins/src.ctf.fs/fail/test_fail
index 7f8a9515..443db0c5 100755
--- a/tests/plugins/src.ctf.fs/fail/test_fail
+++ b/tests/plugins/src.ctf.fs/fail/test_fail
@@ -1,27 +1,16 @@
 #!/bin/bash
 #
-# Copyright (C) 2019 EfficiOS Inc.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; only version 2
-# of the License.
+# SPDX-License-Identifier: GPL-2.0-only
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# Copyright (C) 2019 EfficiOS Inc.
 #
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 # This test validates that a `src.ctf.fs` component handles gracefully invalid
 # CTF traces and produces the expected error message.
 
 SH_TAP=1
 
-if [ "x${BT_TESTS_SRCDIR:-}" != "x" ]; then
+if [ -n "${BT_TESTS_SRCDIR:-}" ]; then
 	UTILSSH="$BT_TESTS_SRCDIR/utils/utils.sh"
 else
 	UTILSSH="$(dirname "$0")/../../../utils/utils.sh"
@@ -34,22 +23,57 @@ fail_trace_dir="$BT_CTF_TRACES_PATH/fail"
 
 stdout_file=$(mktemp -t test_ctf_fail_stdout.XXXXXX)
 stderr_file=$(mktemp -t test_ctf_fail_stderr.XXXXXX)
+data_dir="${BT_TESTS_SRCDIR}/data/plugins/src.ctf.fs/fail"
 
 test_fail() {
 	local name="$1"
-	local expected_error_msg="$2"
+	local expected_stdout_file="$2"
+	local expected_error_msg="$3"
 
 	bt_cli "${stdout_file}" "${stderr_file}" \
-		"${fail_trace_dir}/${name}"
+		-c sink.text.details -p "with-trace-name=no,with-stream-name=no" "${fail_trace_dir}/${name}"
 	isnt $? 0 "Trace ${name}: babeltrace exits with an error"
 
+	bt_diff "${expected_stdout_file}" "${stdout_file}"
+	ok $? "Trace ${name}: babeltrace produces the expected stdout"
+
+	# The expected error message will likely be found in the error stream
+	# even if Babeltrace aborts (e.g. hits an assert).  Check that the
+	# Babeltrace CLI finishes gracefully by checking that the error stream
+	# contains an error stack printed by the CLI.
+	grep --silent "^CAUSED BY " "${stderr_file}"
+	ok $? "Trace ${name}: babeltrace produces an error stack"
+
 	grep --silent "${expected_error_msg}" "${stderr_file}"
 	ok $? "Trace ${name}: babeltrace produces the expected error message"
 }
 
 
-plan_tests 2
+plan_tests 20
+
+test_fail \
+	"invalid-packet-size/trace" \
+	"/dev/null" \
+	"Failed to index CTF stream file '.*channel0_3'"
+
+test_fail \
+	"valid-events-then-invalid-events" \
+	"${data_dir}/valid-events-then-invalid-events.expect" \
+	"No event class with ID of event class ID to use in stream class: .*stream-class-id=0, event-class-id=255"
+
+test_fail \
+	"metadata-syntax-error" \
+	"/dev/null" \
+	"^  At line 3 in metadata stream: syntax error, unexpected CTF_RSBRAC: token=\"]\""
+
+test_fail \
+	"invalid-sequence-length-field-class" \
+	"/dev/null" \
+	"Sequence field class's length field class is not an unsigned integer field class: "
 
-test_fail "invalid-packet-size/trace" "Failed to index CTF stream file '.*channel0_3'"
+test_fail \
+	"invalid-variant-selector-field-class" \
+	"/dev/null" \
+	"Variant field class's tag field class is not an enumeration field class: "
 
 rm -f "${stdout_file}" "${stderr_file}"