From 17cd74051937c9307cbef59abffe5e6488ee3f4c Mon Sep 17 00:00:00 2001 From: Christian Kreibich Date: Fri, 4 Dec 2020 23:18:19 -0800 Subject: [PATCH] Update btest-diff calls on binary files to using "--binary" This converts Johanna's TEST_DIFF_CANONIFIER removals via "env -u" to using the new "btest-diff --binary", and updates the affected baselines. --- .../extract_files.1 | 1 - .../extract_files.2 | 1 - .../extract_files.3 | 1 - .../1-file | 1 - .../2-file | 1 - .../1-file | 1 - .../2-file | 1 - .../3-file | 1 - .../4-file | 1 - .../1-file | 1 - .../2-file | 1 - .../3-file | Bin 209 -> 94 bytes .../4-file | Bin 2464 -> 2349 bytes .../5-file | Bin 27694 -> 27579 bytes .../1-file | 1 - .../2-file | 1 - .../thefile | Bin 42323 -> 42208 bytes .../test.txt | 1 - .../extract_files.thefile | Bin 30469 -> 30354 bytes .../scripts/base/files/extract/limit.zeek | 6 +++--- .../frameworks/file-analysis/http/get.zeek | 4 ++-- .../file-analysis/http/multipart.zeek | 8 ++++---- .../file-analysis/http/pipeline.zeek | 10 +++++----- .../frameworks/file-analysis/http/post.zeek | 4 ++-- .../base/frameworks/file-analysis/irc.zeek | 2 +- .../frameworks/input/raw/executestdin.zeek | 2 +- .../protocols/http/content-range-gap.zeek | 2 +- 27 files changed, 19 insertions(+), 33 deletions(-) diff --git a/testing/btest/Baseline/scripts.base.files.extract.limit/extract_files.1 b/testing/btest/Baseline/scripts.base.files.extract.limit/extract_files.1 index 8a89a1949a..9f858a7cc7 100644 --- a/testing/btest/Baseline/scripts.base.files.extract.limit/extract_files.1 +++ b/testing/btest/Baseline/scripts.base.files.extract.limit/extract_files.1 @@ -1,4 +1,3 @@ -### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. The National Center for Supercomputing Applications 1/28/92 Anonymous FTP Server General Information diff --git a/testing/btest/Baseline/scripts.base.files.extract.limit/extract_files.2 b/testing/btest/Baseline/scripts.base.files.extract.limit/extract_files.2 index b53a6b011f..41f96858de 100644 --- a/testing/btest/Baseline/scripts.base.files.extract.limit/extract_files.2 +++ b/testing/btest/Baseline/scripts.base.files.extract.limit/extract_files.2 @@ -1,4 +1,3 @@ -### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. The National Center for Supercomputing Applications 1/28/92 Anonymous FTP Server General Information diff --git a/testing/btest/Baseline/scripts.base.files.extract.limit/extract_files.3 b/testing/btest/Baseline/scripts.base.files.extract.limit/extract_files.3 index 15ad4fd4d0..ffa6b5b161 100644 --- a/testing/btest/Baseline/scripts.base.files.extract.limit/extract_files.3 +++ b/testing/btest/Baseline/scripts.base.files.extract.limit/extract_files.3 @@ -1,4 +1,3 @@ -### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. The National Center for Supercomputing Applications 1/28/92 Anonymous FTP Server General Information diff --git a/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.get/1-file b/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.get/1-file index ff7b1306be..e68dee74e6 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.get/1-file +++ b/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.get/1-file @@ -1,4 +1,3 @@ -### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. 0.26 | 2012-08-24 15:10:04 -0700 diff --git a/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.get/2-file b/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.get/2-file index 896b113a72..c8435ed950 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.get/2-file +++ b/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.get/2-file @@ -1,4 +1,3 @@ -### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. { "origin": "10.224.189.238", "headers": { diff --git a/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.multipart/1-file b/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.multipart/1-file index bd53b6210f..30d74d2584 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.multipart/1-file +++ b/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.multipart/1-file @@ -1,2 +1 @@ -### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. test \ No newline at end of file diff --git a/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.multipart/2-file b/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.multipart/2-file index 3faafd12cc..d606037cb2 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.multipart/2-file +++ b/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.multipart/2-file @@ -1,2 +1 @@ -### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. test2 \ No newline at end of file diff --git a/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.multipart/3-file b/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.multipart/3-file index 43054ef73b..29f446afe2 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.multipart/3-file +++ b/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.multipart/3-file @@ -1,2 +1 @@ -### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. test3 \ No newline at end of file diff --git a/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.multipart/4-file b/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.multipart/4-file index 245344cc55..8f0eb247e3 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.multipart/4-file +++ b/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.multipart/4-file @@ -1,4 +1,3 @@ -### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. { "data": "", "form": { diff --git a/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.pipeline/1-file b/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.pipeline/1-file index 22e14fdd57..4c2be686a9 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.pipeline/1-file +++ b/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.pipeline/1-file @@ -1,4 +1,3 @@ -### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. /* ************************************************* diff --git a/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.pipeline/2-file b/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.pipeline/2-file index 482bdc4d43..41e217d6c9 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.pipeline/2-file +++ b/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.pipeline/2-file @@ -1,4 +1,3 @@ -### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. //-- Google Analytics Urchin Module //-- Copyright 2007 Google, All Rights Reserved. diff --git a/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.pipeline/3-file b/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.pipeline/3-file index d80020045e7fa49b981f6e4305e56dfb60044556..cdaf76ed70528e9a91b8a6c1418afc03d286a961 100644 GIT binary patch delta 6 Ncmcb}7&oyv4gd*Y0+Rp$ delta 134 zcma#M$XKtetgPS^l3HA%kd#=Qnvo06H9 zrl;VNuaK8tqL7-BS)!*9TAZq&1eR6M4b|5zRZ=L)S12t2nvkle5R_V2npu=u3^m`* bR>45e%vg`h-P6s&GLeOWg<&(pM4li3&D<&o diff --git a/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.pipeline/4-file b/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.pipeline/4-file index 9004f897bcd29d0798999a8ca21a4763709b6920..1383a33f480ecc635afd16c20c906b639f4a321d 100644 GIT binary patch delta 8 PcmZ1=yjEyqu`VY74s`;} delta 136 zcmZ20v_QCCSy@@ZDI~SHL?J1$I5j6TFI6EWu_RF;JvA@2D6u3pMIotDA*lqYKsO~b zElp3sC0`*gzeFK5C9_0NA+$JEK?y9Ypc|^MTdJf`lCMx&05l<0Pa!C^ur#wMwHRu? dovng_o|&;8S7(5qJ1>_M7Xt$W??xU)P5>CUDU|>K diff --git a/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.pipeline/5-file b/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.pipeline/5-file index 2c92c9463ec45d5ec6d5151c1bd25cd9f15d516b..f98abd969e4b94a58b1eac2569e9052926df667f 100644 GIT binary patch delta 10 RcmZ2?gK_tD#*M|hvjHBU1!VvL delta 138 zcmdmeopId_#(HICWd)~@)Z!9_q{QOXoXosbg_OjSM1}O!ywsw^lGGH1q)LUP5}*Rz zl+3g=Jq4G1g}nR{h18VH5= 0.63. hello world \ No newline at end of file diff --git a/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.post/2-file b/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.post/2-file index e3bef28427..c62a7ee379 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.post/2-file +++ b/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.post/2-file @@ -1,4 +1,3 @@ -### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. { "origin": "10.142.133.148", "files": {}, diff --git a/testing/btest/Baseline/scripts.base.frameworks.file-analysis.irc/thefile b/testing/btest/Baseline/scripts.base.frameworks.file-analysis.irc/thefile index 6a2ff4db65dc20b606ddbcafc88e30e409d44d25..d4ec9e374b118f65fbb1f67c14ee1a15a26e58e7 100644 GIT binary patch delta 19 bcmcb7is`{gCYAtiW|ql!mq={vKe7Y>RP+eN delta 138 zcmaEGlIij(rg~*%Wd)~@)Z!9_q{QOXoXosbg_OjSM1}O!ywsw^lGGH1q)LUP5}*Rz zl+3g=Jq4G1g}nR{h18VH5=@?2R001vM$u>b%7 diff --git a/testing/btest/Baseline/scripts.base.frameworks.input.raw.executestdin/test.txt b/testing/btest/Baseline/scripts.base.frameworks.input.raw.executestdin/test.txt index 6cf4cf7962..0205cd7c3a 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.input.raw.executestdin/test.txt +++ b/testing/btest/Baseline/scripts.base.frameworks.input.raw.executestdin/test.txt @@ -1,3 +1,2 @@ -### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63. hello thereyay \ No newline at end of file diff --git a/testing/btest/Baseline/scripts.base.protocols.http.content-range-gap/extract_files.thefile b/testing/btest/Baseline/scripts.base.protocols.http.content-range-gap/extract_files.thefile index 5e16b27344e47454e3bb75268041f287f3f64ac9..fc6cc2271fcae2b16af6f89713eb82f41ac08104 100644 GIT binary patch delta 18 acmZpD$2jRNIP} b)Oget-gzip.out # @TEST-EXEC: btest-diff get.out # @TEST-EXEC: btest-diff get-gzip.out -# @TEST-EXEC: env -u TEST_DIFF_CANONIFIER btest-diff 1-file -# @TEST-EXEC: env -u TEST_DIFF_CANONIFIER btest-diff 2-file +# @TEST-EXEC: btest-diff --binary 1-file +# @TEST-EXEC: btest-diff --binary 2-file @load base/protocols/http diff --git a/testing/btest/scripts/base/frameworks/file-analysis/http/multipart.zeek b/testing/btest/scripts/base/frameworks/file-analysis/http/multipart.zeek index 0730ad7992..16d348731f 100644 --- a/testing/btest/scripts/base/frameworks/file-analysis/http/multipart.zeek +++ b/testing/btest/scripts/base/frameworks/file-analysis/http/multipart.zeek @@ -1,9 +1,9 @@ # @TEST-EXEC: zeek -b -r $TRACES/http/multipart.trace $SCRIPTS/file-analysis-test.zeek %INPUT >out # @TEST-EXEC: btest-diff out -# @TEST-EXEC: env -u TEST_DIFF_CANONIFIER btest-diff 1-file -# @TEST-EXEC: env -u TEST_DIFF_CANONIFIER btest-diff 2-file -# @TEST-EXEC: env -u TEST_DIFF_CANONIFIER btest-diff 3-file -# @TEST-EXEC: env -u TEST_DIFF_CANONIFIER btest-diff 4-file +# @TEST-EXEC: btest-diff --binary 1-file +# @TEST-EXEC: btest-diff --binary 2-file +# @TEST-EXEC: btest-diff --binary 3-file +# @TEST-EXEC: btest-diff --binary 4-file @load base/protocols/http diff --git a/testing/btest/scripts/base/frameworks/file-analysis/http/pipeline.zeek b/testing/btest/scripts/base/frameworks/file-analysis/http/pipeline.zeek index 2cd61c0aae..ff78f6c70e 100644 --- a/testing/btest/scripts/base/frameworks/file-analysis/http/pipeline.zeek +++ b/testing/btest/scripts/base/frameworks/file-analysis/http/pipeline.zeek @@ -1,10 +1,10 @@ # @TEST-EXEC: zeek -b -r $TRACES/http/pipelined-requests.trace $SCRIPTS/file-analysis-test.zeek %INPUT >out # @TEST-EXEC: btest-diff out -# @TEST-EXEC: env -u TEST_DIFF_CANONIFIER btest-diff 1-file -# @TEST-EXEC: env -u TEST_DIFF_CANONIFIER btest-diff 2-file -# @TEST-EXEC: env -u TEST_DIFF_CANONIFIER btest-diff 3-file -# @TEST-EXEC: env -u TEST_DIFF_CANONIFIER btest-diff 4-file -# @TEST-EXEC: env -u TEST_DIFF_CANONIFIER btest-diff 5-file +# @TEST-EXEC: btest-diff --binary 1-file +# @TEST-EXEC: btest-diff --binary 2-file +# @TEST-EXEC: btest-diff --binary 3-file +# @TEST-EXEC: btest-diff --binary 4-file +# @TEST-EXEC: btest-diff --binary 5-file @load base/protocols/http diff --git a/testing/btest/scripts/base/frameworks/file-analysis/http/post.zeek b/testing/btest/scripts/base/frameworks/file-analysis/http/post.zeek index 6e9084804a..d1932eead7 100644 --- a/testing/btest/scripts/base/frameworks/file-analysis/http/post.zeek +++ b/testing/btest/scripts/base/frameworks/file-analysis/http/post.zeek @@ -1,7 +1,7 @@ # @TEST-EXEC: zeek -b -r $TRACES/http/post.trace $SCRIPTS/file-analysis-test.zeek %INPUT >out # @TEST-EXEC: btest-diff out -# @TEST-EXEC: env -u TEST_DIFF_CANONIFIER btest-diff 1-file -# @TEST-EXEC: env -u TEST_DIFF_CANONIFIER btest-diff 2-file +# @TEST-EXEC: btest-diff --binary 1-file +# @TEST-EXEC: btest-diff --binary 2-file @load base/protocols/http diff --git a/testing/btest/scripts/base/frameworks/file-analysis/irc.zeek b/testing/btest/scripts/base/frameworks/file-analysis/irc.zeek index 71341dbfd9..ed1c7e53b5 100644 --- a/testing/btest/scripts/base/frameworks/file-analysis/irc.zeek +++ b/testing/btest/scripts/base/frameworks/file-analysis/irc.zeek @@ -1,6 +1,6 @@ # @TEST-EXEC: zeek -b -r $TRACES/irc-dcc-send.trace $SCRIPTS/file-analysis-test.zeek %INPUT >out # @TEST-EXEC: btest-diff out -# @TEST-EXEC: env -u TEST_DIFF_CANONIFIER btest-diff thefile +# @TEST-EXEC: btest-diff --binary thefile @load base/protocols/irc diff --git a/testing/btest/scripts/base/frameworks/input/raw/executestdin.zeek b/testing/btest/scripts/base/frameworks/input/raw/executestdin.zeek index 496e5ae3fd..08f1a40275 100644 --- a/testing/btest/scripts/base/frameworks/input/raw/executestdin.zeek +++ b/testing/btest/scripts/base/frameworks/input/raw/executestdin.zeek @@ -1,6 +1,6 @@ # @TEST-EXEC: btest-bg-run zeek zeek -b %INPUT # @TEST-EXEC: btest-bg-wait 15 -# @TEST-EXEC: env -u TEST_DIFF_CANONIFIER btest-diff test.txt +# @TEST-EXEC: btest-diff --binary test.txt # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort btest-diff out redef exit_only_after_terminate = T; diff --git a/testing/btest/scripts/base/protocols/http/content-range-gap.zeek b/testing/btest/scripts/base/protocols/http/content-range-gap.zeek index 1bb0916b40..a49a76668c 100644 --- a/testing/btest/scripts/base/protocols/http/content-range-gap.zeek +++ b/testing/btest/scripts/base/protocols/http/content-range-gap.zeek @@ -1,5 +1,5 @@ # @TEST-EXEC: zeek -b -r $TRACES/http/content-range-gap.trace %INPUT -# @TEST-EXEC: env -u TEST_DIFF_CANONIFIER btest-diff extract_files/thefile +# @TEST-EXEC: btest-diff --binary extract_files/thefile @load base/protocols/http @load base/files/extract