X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fcli%2Fquery%2Ftest-query.sh;h=ca9c001d6a530f26a3fa7b0d8871fda62848963a;hb=db01f759a69290bc1608f60c2942c4c36a282708;hp=b5e023749820aadd0272a5d5aae4da9304f5d67c;hpb=407d3b1055a8457c8927fb4ae79841774c1872d1;p=babeltrace.git

diff --git a/tests/cli/query/test-query.sh b/tests/cli/query/test-query.sh
index b5e02374..ca9c001d 100755
--- a/tests/cli/query/test-query.sh
+++ b/tests/cli/query/test-query.sh
@@ -58,11 +58,15 @@ expect_failure() {
 
 	# Ensure that a CLI error stack is printed (and that babeltrace doesn't
 	# abort before that).
-	bt_grep --silent "^ERROR: " "${stderr_file}"
-	ok $? "${test_name}: babeltrace produces an error stack"
-
-	bt_grep --silent "${expected_str}" "${stderr_file}"
-	ok "$?" "${test_name}: expect \`${expected_str}\` error message on stderr"
+	bt_grep_ok \
+		"^ERROR: " \
+		"${stderr_file}" \
+		"${test_name}: babeltrace produces an error stack"
+
+	bt_grep_ok \
+		"${expected_str}" \
+		"${stderr_file}" \
+		"${test_name}: expect \`${expected_str}\` error message on stderr"
 }
 
 expect_success 'the-object:{}' \