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 d80020045e..cdaf76ed70 100644 Binary files a/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.pipeline/3-file and b/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.pipeline/3-file differ 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 9004f897bc..1383a33f48 100644 Binary files a/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.pipeline/4-file and b/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.pipeline/4-file differ 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 2c92c9463e..f98abd969e 100644 Binary files a/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.pipeline/5-file and b/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.pipeline/5-file differ diff --git a/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.post/1-file b/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.post/1-file index a7471bfeaf..95d09f2b10 100644 --- a/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.post/1-file +++ b/testing/btest/Baseline/scripts.base.frameworks.file-analysis.http.post/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. 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 6a2ff4db65..d4ec9e374b 100644 Binary files a/testing/btest/Baseline/scripts.base.frameworks.file-analysis.irc/thefile and b/testing/btest/Baseline/scripts.base.frameworks.file-analysis.irc/thefile differ 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 5e16b27344..fc6cc2271f 100644 Binary files a/testing/btest/Baseline/scripts.base.protocols.http.content-range-gap/extract_files.thefile and b/testing/btest/Baseline/scripts.base.protocols.http.content-range-gap/extract_files.thefile differ diff --git a/testing/btest/scripts/base/files/extract/limit.zeek b/testing/btest/scripts/base/files/extract/limit.zeek index e384dd0c9b..cf84a8371a 100644 --- a/testing/btest/scripts/base/files/extract/limit.zeek +++ b/testing/btest/scripts/base/files/extract/limit.zeek @@ -1,12 +1,12 @@ # @TEST-EXEC: zeek -b -r $TRACES/ftp/retr.trace %INPUT max_extract=3000 efname=1 -# @TEST-EXEC: env -u TEST_DIFF_CANONIFIER btest-diff extract_files/1 +# @TEST-EXEC: btest-diff --binary extract_files/1 # @TEST-EXEC: btest-diff 1.out # @TEST-EXEC: zeek -b -r $TRACES/ftp/retr.trace %INPUT max_extract=3000 efname=2 double_it=T -# @TEST-EXEC: env -u TEST_DIFF_CANONIFIER btest-diff extract_files/2 +# @TEST-EXEC: btest-diff --binary extract_files/2 # @TEST-EXEC: btest-diff 2.out # @TEST-EXEC: btest-diff files.log # @TEST-EXEC: zeek -b -r $TRACES/ftp/retr.trace %INPUT max_extract=7000 efname=3 unlimit_it=T -# @TEST-EXEC: env -u TEST_DIFF_CANONIFIER btest-diff extract_files/3 +# @TEST-EXEC: btest-diff --binary extract_files/3 # @TEST-EXEC: btest-diff 3.out @load base/files/extract diff --git a/testing/btest/scripts/base/frameworks/file-analysis/http/get.zeek b/testing/btest/scripts/base/frameworks/file-analysis/http/get.zeek index 2204454e55..63ef2e6963 100644 --- a/testing/btest/scripts/base/frameworks/file-analysis/http/get.zeek +++ b/testing/btest/scripts/base/frameworks/file-analysis/http/get.zeek @@ -2,8 +2,8 @@ # @TEST-EXEC: zeek -b -r $TRACES/http/get-gzip.trace $SCRIPTS/file-analysis-test.zeek %INPUT c=2 >get-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