It's easier to analyze failures when the lines that are different
are shown next to each other.

Signed-off-by: Ilya Maximets <[email protected]>
---
 tests/ovsdb-client.at | 6 +++---
 tests/ovsdb-server.at | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/ovsdb-client.at b/tests/ovsdb-client.at
index 68fb962bd..dcddb2587 100644
--- a/tests/ovsdb-client.at
+++ b/tests/ovsdb-client.at
@@ -270,8 +270,8 @@ AT_CHECK([ovsdb-client --replay=./replay_dir                
      dnl
 dnl Waiting for client to exit the same way as it exited during recording.
 OVS_WAIT_WHILE([test -e ovsdb-client.pid])
 
-AT_CHECK([diff monitor.stdout monitor-replay.stdout])
-AT_CHECK([diff monitor.stderr monitor-replay.stderr])
+AT_CHECK([diff -u monitor.stdout monitor-replay.stdout])
+AT_CHECK([diff -u monitor.stderr monitor-replay.stderr])
 
 dnl Stripping out timestamps, PIDs and poll_loop warnings from the log.
 dnl Also stripping socket_util errors as sockets are not used in replay.
@@ -284,6 +284,6 @@ m4_define([CLEAN_LOG_FILE],
 CLEAN_LOG_FILE([monitor.log], [monitor.log.clear])
 CLEAN_LOG_FILE([monitor-replay.log], [monitor-replay.log.clear])
 
-AT_CHECK([diff monitor.log.clear monitor-replay.log.clear])
+AT_CHECK([diff -u monitor.log.clear monitor-replay.log.clear])
 
 AT_CLEANUP
diff --git a/tests/ovsdb-server.at b/tests/ovsdb-server.at
index 35286db37..6eb758e22 100644
--- a/tests/ovsdb-server.at
+++ b/tests/ovsdb-server.at
@@ -2394,6 +2394,6 @@ CLEAN_LOG_FILE([2.log], [2.log.clear])
 
 dnl Checking that databases and logs are equal.
 AT_CHECK([diff db.clear ./replay_dir/db.copy.clear])
-AT_CHECK([diff 1.log.clear 2.log.clear])
+AT_CHECK([diff -u 1.log.clear 2.log.clear])
 
 AT_CLEANUP
-- 
2.43.0

_______________________________________________
dev mailing list
[email protected]
https://mail.openvswitch.org/mailman/listinfo/ovs-dev

Reply via email to