tests/cli/test_output_ctf_metadata: use `bt_cli` and `diff`

This makes the output more readable/analyzable on failure.

Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Signed-off-by: Philippe Proulx <eeppeliteloop@gmail.com>
Change-Id: I2466a032d7cfc2b8b6eb2de4b473dd1bb0c193df
Reviewed-on: https://review.lttng.org/c/babeltrace/+/12746

diff --git a/tests/cli/test-output-ctf-metadata.sh b/tests/cli/test-output-ctf-metadata.sh
index 28aa2a1070cf9fbb934e5db1fd7d7a813f5f4427..3b1ecab3d0c4ab5116e74c1efd48f696929e07fa 100755 (executable)
--- a/tests/cli/test-output-ctf-metadata.sh
+++ b/tests/cli/test-output-ctf-metadata.sh
@@ -21,16 +21,18 @@ NUM_TESTS=3
 plan_tests $NUM_TESTS
 
 tmp_metadata=$(mktemp)
+tmp_stderr=$(mktemp)
 
 # Test a valid trace directory.
-"${BT_TESTS_BT2_BIN}" -o ctf-metadata "${BT_CTF_TRACES_PATH}/1/succeed/wk-heartbeat-u" > "$tmp_metadata"
+bt_cli "$tmp_metadata" "$tmp_stderr" -o ctf-metadata "${BT_CTF_TRACES_PATH}/1/succeed/wk-heartbeat-u"
 ok $? "Run babeltrace -o ctf-metadata with a valid trace directory, correct exit status"
 
 bt_diff "${BT_TESTS_DATADIR}/cli/test-output-ctf-metadata.ref" "$tmp_metadata"
 ok $? "Run babeltrace -o ctf-metadata with a valid trace directory, correct output"
 
 # Test an invalid trace directory.
-"${BT_TESTS_BT2_BIN}" -o ctf-metadata "${BT_CTF_TRACES_PATH}" >/dev/null 2>&1
+bt_cli "$tmp_metadata" "$tmp_stderr" -o ctf-metadata "${BT_CTF_TRACES_PATH}"
 isnt $? 0 "Run babeltrace -o ctf-metadata with an invalid trace directory, expecting failure"
 
 rm -f "$tmp_metadata"
+rm -f "$tmp_stderr"