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

diff --git a/tests/cli/test_output_ctf_metadata b/tests/cli/test_output_ctf_metadata
index 58969f8a9b9db7b777b099abdba82ef451ffdffc..eb63d0796aa0b919d85f5639553e35d04a4104c8 100755 (executable)
--- a/tests/cli/test_output_ctf_metadata
+++ b/tests/cli/test_output_ctf_metadata
@@ -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}/succeed/wk-heartbeat-u" > "$tmp_metadata"
+bt_cli "$tmp_metadata" "$tmp_stderr" -o ctf-metadata "${BT_CTF_TRACES_PATH}/succeed/wk-heartbeat-u"
 ok $? "Run babeltrace -o ctf-metadata with a valid trace directory, correct exit status"
 
-cmp -s "$tmp_metadata" "${BT_TESTS_DATADIR}/cli/test_output_ctf_metadata.ref"
+diff -u "$tmp_metadata" "${BT_TESTS_DATADIR}/cli/test_output_ctf_metadata.ref"
 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"