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.

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
 

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
 

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
 

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
 

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": {

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

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

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

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": {

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.
 /*
 *************************************************
 

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.
 

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

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": {},

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
 there

yay

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

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
 

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
 

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
 

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
 

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
 

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;

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