From: Simon Marchi <simon.marchi@efficios.com>
Date: Wed, 3 Jul 2019 15:40:49 +0000 (-0400)
Subject: tests: Use diff -u
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=1af7795bba1a6f1a851cedc3434061fcad7e0adc

tests: Use diff -u

We are all more used to "unified" diff output formats than other
formats, so I suggest we use that for differences between expected and
actual results.

Change-Id: I681fcd232459eedf9c084514ca9d54be9732adcc
Signed-off-by: Simon Marchi <simon.marchi@efficios.com>
Reviewed-on: https://review.lttng.org/c/babeltrace/+/1601
Reviewed-by: Jonathan Rajotte Julien <jonathan.rajotte-julien@efficios.com>
Reviewed-by: Michael Jeanson <mjeanson@efficios.com>
Reviewed-by: Philippe Proulx <eeppeliteloop@gmail.com>
CI-Build: Michael Jeanson <mjeanson@efficios.com>
Tested-by: jenkins <jenkins@lttng.org>
---

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index c44e2e3b..a66acd99 100644
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -121,7 +121,7 @@ bt_diff_cli() {
 	echo "$args" | xargs "$BT_TESTS_BT2_BIN" 2>/dev/null | tr -d "\r" > "$temp_output_file"
 
 	# Compare output with expected output
-	if ! diff "$temp_output_file" "$expected_file" 2>/dev/null >"$temp_diff"; then
+	if ! diff -u "$temp_output_file" "$expected_file" 2>/dev/null >"$temp_diff"; then
 		echo "ERROR: for '$args': actual and expected outputs differ:" >&2
 		cat "$temp_diff" >&2
 		ret=1