diff --git a/testing/btest/Baseline/scripts.base.frameworks.logging.dataseries.test-logging/ssh.ds.txt b/testing/btest/Baseline/scripts.base.frameworks.logging.dataseries.test-logging/ssh.ds.txt index f66f40b701..05026a24ef 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.logging.dataseries.test-logging/ssh.ds.txt +++ b/testing/btest/Baseline/scripts.base.frameworks.logging.dataseries.test-logging/ssh.ds.txt @@ -31,11 +31,11 @@ extent offset ExtentType 604 DataSeries: ExtentIndex # Extent, type='ssh' t id.orig_h id.orig_p id.resp_h id.resp_p status country -1.334e+09 1.2.3.4 1234 2.3.4.5 80 success unknown -1.334e+09 1.2.3.4 1234 2.3.4.5 80 failure US -1.334e+09 1.2.3.4 1234 2.3.4.5 80 failure UK -1.334e+09 1.2.3.4 1234 2.3.4.5 80 success BR -1.334e+09 1.2.3.4 1234 2.3.4.5 80 failure MX +X.XXXe+09 1.2.3.4 1234 2.3.4.5 80 success unknown +X.XXXe+09 1.2.3.4 1234 2.3.4.5 80 failure US +X.XXXe+09 1.2.3.4 1234 2.3.4.5 80 failure UK +X.XXXe+09 1.2.3.4 1234 2.3.4.5 80 success BR +X.XXXe+09 1.2.3.4 1234 2.3.4.5 80 failure MX # Extent, type='DataSeries: ExtentIndex' offset extenttype 40 DataSeries: XmlType diff --git a/testing/btest/Baseline/scripts.base.frameworks.logging.dataseries.wikipedia/http.ds.txt b/testing/btest/Baseline/scripts.base.frameworks.logging.dataseries.wikipedia/http.ds.txt index 49e431085c..a0c6cbbff3 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.logging.dataseries.wikipedia/http.ds.txt +++ b/testing/btest/Baseline/scripts.base.frameworks.logging.dataseries.wikipedia/http.ds.txt @@ -55,18 +55,18 @@ - + - + extent offset ExtentType 40 DataSeries: XmlType -756 http -1144 DataSeries: ExtentIndex +768 http +1156 DataSeries: ExtentIndex # Extent, type='http' ts uid id.orig_h id.orig_p id.resp_h id.resp_p trans_depth method host uri referrer user_agent request_body_len response_body_len status_code status_msg info_code info_msg filename tags username password proxied mime_type md5 extraction_file 1.3e+09 j4u32Pc5bif 141.142.220.118 48649 208.80.152.118 80 0 0 0 304 Not Modified 0 @@ -86,5 +86,5 @@ ts uid id.orig_h id.orig_p id.resp_h id.resp_p trans_depth method host uri refer # Extent, type='DataSeries: ExtentIndex' offset extenttype 40 DataSeries: XmlType -756 http -1144 DataSeries: ExtentIndex +768 http +1156 DataSeries: ExtentIndex diff --git a/testing/btest/scripts/base/frameworks/logging/dataseries/test-logging.bro b/testing/btest/scripts/base/frameworks/logging/dataseries/test-logging.bro index c7f8a5618f..76f2451477 100644 --- a/testing/btest/scripts/base/frameworks/logging/dataseries/test-logging.bro +++ b/testing/btest/scripts/base/frameworks/logging/dataseries/test-logging.bro @@ -2,7 +2,7 @@ # @TEST-REQUIRES: has-writer DataSeries && which ds2txt # # @TEST-EXEC: bro -b %INPUT Log::default_writer=Log::WRITER_DATASERIES -# @TEST-EXEC: ds2txt ssh.ds >ssh.ds.txt +# @TEST-EXEC: ds2txt ssh.ds | ${SCRIPTS}/diff-remove-timestamps-dataseries >ssh.ds.txt # @TEST-EXEC: btest-diff ssh.ds.txt module SSH; diff --git a/testing/external/subdir-btest.cfg b/testing/external/subdir-btest.cfg index c4e74f99fa..fba89fb724 100644 --- a/testing/external/subdir-btest.cfg +++ b/testing/external/subdir-btest.cfg @@ -10,7 +10,7 @@ BROPATH=`bash -c %(testbase)s/../../../build/bro-path-dev`:%(testbase)s/../scrip BRO_SEED_FILE=%(testbase)s/../random.seed TZ=UTC LC_ALL=C -PATH=%(testbase)s/../../../build/src:%(testbase)s/../../../aux/btest:%(default_path)s +PATH=%(testbase)s/../../../build/src:%(testbase)s/../../../aux/btest:%(testbase)s/../../scripts:%(default_path)s TEST_DIFF_CANONIFIER=%(testbase)s/../../scripts/diff-canonifier-external TEST_DIFF_BRIEF=1 TRACES=%(testbase)s/Traces diff --git a/testing/scripts/diff-remove-timestamps-dataseries b/testing/scripts/diff-remove-timestamps-dataseries new file mode 100755 index 0000000000..5b20f138af --- /dev/null +++ b/testing/scripts/diff-remove-timestamps-dataseries @@ -0,0 +1,6 @@ +#! /usr/bin/env bash +# +# Replace anything which looks like DataSeries timestamps (which is a double) with XXXs. + +sed 's/1\.[0-9]*e+09/X.XXXe+09/g' +