From de1c13e3a380bf8b30ccecf1fc28fd4c8967952e Mon Sep 17 00:00:00 2001 From: Daniel Thayer Date: Thu, 1 Dec 2016 16:35:54 -0600 Subject: [PATCH] Fix test core.pcap.dumper to work on OpenBSD The sdiff command on OpenBSD truncates the output at a different position than sdiff on other platforms. Simple fix is to use diff instead of sdiff. --- testing/btest/Baseline/core.pcap.dumper/output | 5 ++++- testing/btest/core/pcap/dumper.bro | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/testing/btest/Baseline/core.pcap.dumper/output b/testing/btest/Baseline/core.pcap.dumper/output index c32a9e1b5e..1fef85cb6f 100644 --- a/testing/btest/Baseline/core.pcap.dumper/output +++ b/testing/btest/Baseline/core.pcap.dumper/output @@ -1 +1,4 @@ -00000010 ff ff 00 00 01 00 00 00 1d a2 b2 4e 73 00 07 00 | | 00000010 00 20 00 00 01 00 00 00 1d a2 b2 4e 73 00 07 00 | +2c2 +< 00000010 ff ff 00 00 01 00 00 00 1d a2 b2 4e 73 00 07 00 |...........Ns...| +--- +> 00000010 00 20 00 00 01 00 00 00 1d a2 b2 4e 73 00 07 00 |. .........Ns...| diff --git a/testing/btest/core/pcap/dumper.bro b/testing/btest/core/pcap/dumper.bro index c8d03bc783..facb86a830 100644 --- a/testing/btest/core/pcap/dumper.bro +++ b/testing/btest/core/pcap/dumper.bro @@ -1,5 +1,5 @@ # @TEST-EXEC: bro -r $TRACES/workshop_2011_browse.trace -w dump # @TEST-EXEC: hexdump -C $TRACES/workshop_2011_browse.trace >1 # @TEST-EXEC: hexdump -C dump >2 -# @TEST-EXEC: sdiff -s 1 2 | awk '{ gsub(/\t/, " "); print }' >output || true +# @TEST-EXEC: diff 1 2 >output || true # @TEST-EXEC: btest-diff output