Merge remote-tracking branch 'origin/topic/christian/gh-1307-baseline-refresh'

* origin/topic/christian/gh-1307-baseline-refresh:
  Additional use of btest-diff --binary
  Update btest-diff calls on binary files to using "--binary"
  Switch to btest-diff with --binary support
  Update external baseline commit hashes
  Fix binary baseline & line-end problem
  Fix diff-remove-abspath on OSX
  Bump submodules for btest 0.64 update
  Canonifier improvements for the scripts.base.frameworks.logging.ascii-double test
  Baseline refresh to reflect btest 0.64
  Make diff-remove-abspath canonifier match on non-whitespace paths only
  Harden diff-remove-timestamps canonifier

CHANGES

@@ -1,4 +1,20 @@
 
+3.3.0-dev.621 | 2020-12-07 18:04:07 +0000
+
+  * Switch test baselines to canonified baselines
+
+    All baselines are now using the new btest feature to save baselines in the canonified
+    form (after the canonifiers are run). This should, hopefully, lead to less changes in
+    the future - that are easier to diff.
+
+    In addition, this cleans up a few small problems of the canonifiers which were over-eager
+    in identifying some numerical and path values.
+
+    We also use the new btest-diff --binary flag to identify binary files on which no
+    canonifier (not even the default canonifier) is applied.
+
+    (Christian Kreibich, Corelight with tiny additions by Johanna Amann, Corelight)
+
 3.3.0-dev.609 | 2020-12-04 19:20:39 -0800
 
   * Remove an extraneous Zeekygen-style comment (Jon Siwek, Corelight)

VERSION

@@ -1 +1 @@
-3.3.0-dev.609
+3.3.0-dev.621

auxil/btest

@@ -1 +1 @@
-Subproject commit 26c180e0c6a14ced1853dfb42be0e7b99c71eca0
+Subproject commit 93227bc064ccf51857d0dd83cefaa8325c2f0ce0

auxil/paraglob

@@ -1 +1 @@
-Subproject commit f7b6c4566187e8a7968ceab58bb329da25142ea2
+Subproject commit 61af2af691a0d3b04c740fe8a9df6e5b410c464e

auxil/zeek-aux

@@ -1 +1 @@
-Subproject commit 037bd04115ee0176536d85374f39980a45e9ff92
+Subproject commit 633271fa09ec69006b43122deea02dc18a6c6907

auxil/zeekctl

@@ -1 +1 @@
-Subproject commit 0abed02b22f75d40d8c089fa1185681a6a9ee6d6
+Subproject commit 78228b4a570a382517f9154087340e6638a51fbe

testing/btest/Baseline/bifs.addr_count_conversion/output

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 [536939960, 2242052096, 35374, 57701172]
 2001:db8:85a3::8a2e:370:7334
 [16909060]

testing/btest/Baseline/bifs.addr_to_ptr_name/output

@@ -1,2 +1,3 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 2.1.0.1.0.0.0.0.0.0.0.0.0.0.0.0.2.0.8.0.9.0.0.4.0.b.8.f.7.0.6.2.ip6.arpa
 52.225.125.74.in-addr.arpa

testing/btest/Baseline/bifs.addr_version/out

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 T
 F
 F

testing/btest/Baseline/bifs.all_set/out

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 F
 T
 T

testing/btest/Baseline/bifs.analyzer_name/out

@@ -1 +1,2 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 PIA_TCP

testing/btest/Baseline/bifs.any_set/out

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 T
 F
 F

testing/btest/Baseline/bifs.backtrace/out

@@ -1,13 +1,14 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 
 --- Backtrace ---
-#0: print_bt() at /home/jon/pro/zeek/zeek/testing/btest/.tmp/bifs.backtrace/backtrace.zeek:26
+#0: print_bt() at <...>/backtrace.zeek:26
 #1: zeek_init()
 
 --- Backtrace ---
-| #0: print_bt() at /home/jon/pro/zeek/zeek/testing/btest/.tmp/bifs.backtrace/backtrace.zeek:20 | #1: bar() at /home/jon/pro/zeek/zeek/testing/btest/.tmp/bifs.backtrace/backtrace.zeek:27 | #2: zeek_init() |
+| #0: print_bt() at <...>/backtrace.zeek:20 | #1: bar() at <...>/backtrace.zeek:27 | #2: zeek_init() |
 
 --- Backtrace ---
-#0: print_bt(show_args: bool = T, one_line: bool = F) at /home/jon/pro/zeek/zeek/testing/btest/.tmp/bifs.backtrace/backtrace.zeek:15
+#0: print_bt(show_args: bool = T, one_line: bool = F) at <...>/backtrace.zeek:15
-#1: foo(c: count = 444) at /home/jon/pro/zeek/zeek/testing/btest/.tmp/bifs.backtrace/backtrace.zeek:21
+#1: foo(c: count = 444) at <...>/backtrace.zeek:21
-#2: bar(a: string = asdf, b: bool = T) at /home/jon/pro/zeek/zeek/testing/btest/.tmp/bifs.backtrace/backtrace.zeek:27
+#2: bar(a: string = asdf, b: bool = T) at <...>/backtrace.zeek:27
 #3: zeek_init()

testing/btest/Baseline/bifs.bloomfilter-seed/output

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 bf1, global_seed, 4955302038280957656
 bf2, global_seed, 11260532077783130352
 bf3, my_seed, 4955302038280957656

testing/btest/Baseline/bifs.bloomfilter/output

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 error: incompatible Bloom filter types
 error: incompatible Bloom filter types
 error: incompatible Bloom filter types

testing/btest/Baseline/bifs.bytestring_to_count/out

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 0
 0
 0

testing/btest/Baseline/bifs.bytestring_to_double/out

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 3.140000e+15
 -3.140000e+15
 4.000000e-308

testing/btest/Baseline/bifs.bytestring_to_hexstr/out

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 3034
 
 00

testing/btest/Baseline/bifs.cat/out

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 foo3T
 
 3T

testing/btest/Baseline/bifs.check_subnet/output

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 in says: 10.2.0.2/32 is member
 check_subnet says: 10.2.0.2/32 is no member
 in says: 10.2.0.2/31 is member

testing/btest/Baseline/bifs.clear_table/out

@@ -1,2 +1,3 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 1
 0

testing/btest/Baseline/bifs.compress_path/out

@@ -1,2 +1,3 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 ../foo
 ../foo

testing/btest/Baseline/bifs.convert_for_pattern/out

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 foo
 
 b\[a\-z\]\+

testing/btest/Baseline/bifs.count_to_addr/out

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 0.0.0.1
 48.21.133.122
 255.255.255.255

testing/btest/Baseline/bifs.create_file/out

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 T
 testfile
 F

testing/btest/Baseline/bifs.create_file/testfile

@@ -1,2 +1,3 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 This is a test
 another test

testing/btest/Baseline/bifs.create_file/testfile2

@@ -1 +1,2 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 new text

testing/btest/Baseline/bifs.decode_base64/out

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 bro
 bro
 bro

testing/btest/Baseline/bifs.directory_operations/out

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 T
 T
 T

testing/btest/Baseline/bifs.disable_analyzer-early/out

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 proto confirm, Analyzer::ANALYZER_HTTP
 T
 http_request, GET, /style/enhanced.css

testing/btest/Baseline/bifs.disable_analyzer-tcp-packet-children/out

@@ -1,2 +1,3 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 triggered packets, [orig_h=192.168.1.104, orig_p=1673/tcp, resp_h=63.245.209.11, resp_p=80/tcp], 1, T
 T

testing/btest/Baseline/bifs.disable_analyzer/out

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 proto confirm, Analyzer::ANALYZER_HTTP
 http_request, GET, /style/enhanced.css
 T

testing/btest/Baseline/bifs.dump_current_packet/1.hex

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 00000000  d4 c3 b2 a1 02 00 04 00  00 00 00 00 00 00 00 00  |................|
 00000010  00 24 00 00 01 00 00 00  1f ad 83 4d 17 79 01 00  |.$.........M.y..|
 00000020  57 00 00 00 57 00 00 00  01 00 5e 00 00 fb 00 30  |W...W.....^....0|

testing/btest/Baseline/bifs.dump_current_packet/2.hex

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 00000000  d4 c3 b2 a1 02 00 04 00  00 00 00 00 00 00 00 00  |................|
 00000010  00 24 00 00 01 00 00 00  1f ad 83 4d f4 7a 01 00  |.$.........M.z..|
 00000020  d5 00 00 00 d5 00 00 00  33 33 00 00 00 fb 00 17  |........33......|

testing/btest/Baseline/bifs.edit/out

@@ -1 +1,2 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 llo t

testing/btest/Baseline/bifs.encode_base64/out

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 YnJv
 YnJv
 YnJv

testing/btest/Baseline/bifs.entropy_test/out

@@ -1,2 +1,3 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 [entropy=4.715374, chi_square=591.981818, mean=75.472727, monte_carlo_pi=4.0, serial_correlation=-0.11027]
 [entropy=2.083189, chi_square=3906.018182, mean=69.054545, monte_carlo_pi=4.0, serial_correlation=0.849402]

testing/btest/Baseline/bifs.enum_to_int/out

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 A, 0
 B, 1
 C, 2

testing/btest/Baseline/bifs.escape_string/out

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 12
 Test \x00string
 15

testing/btest/Baseline/bifs.exit/out

@@ -1 +1,2 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 hello

testing/btest/Baseline/bifs.file_mode/out

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 rw-r--r--
 rwxrwxrwx
 rwxrwxrwt

testing/btest/Baseline/bifs.filter_subnet_table/output

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 {
 10.2.0.2/31,
 10.0.0.0/8,

testing/btest/Baseline/bifs.find_all/out

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 hi
 es
 -------------------

testing/btest/Baseline/bifs.find_all_ordered/out

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 [this, is, a, test]
 [one, two, three, four, one, two, three, four]
 [this, is, a, test, test, test]

testing/btest/Baseline/bifs.find_entropy/out

@@ -1,2 +1,3 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 [entropy=4.715374, chi_square=591.981818, mean=75.472727, monte_carlo_pi=4.0, serial_correlation=-0.11027]
 [entropy=2.083189, chi_square=3906.018182, mean=69.054545, monte_carlo_pi=4.0, serial_correlation=0.849402]

testing/btest/Baseline/bifs.find_last/out

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 es
 -------------------
 0

testing/btest/Baseline/bifs.fmt/out

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 test
 %
 

testing/btest/Baseline/bifs.fmt_ftp_port/out

@@ -1,2 +1,3 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 192,168,0,2,1,1
 

testing/btest/Baseline/bifs.get_current_packet_header/output

@@ -1 +1,2 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 [l2=[encap=LINK_ETHERNET, len=78, cap_len=78, src=00:00:00:00:00:00, dst=ff:ff:ff:ff:ff:ff, vlan=<uninitialized>, inner_vlan=<uninitialized>, eth_type=34525, proto=L3_IPV6], ip=<uninitialized>, ip6=[class=0, flow=0, len=24, nxt=58, hlim=255, src=fe80::dead, dst=fe80::beef, exts=[]], tcp=<uninitialized>, udp=<uninitialized>, icmp=[icmp_type=135]]

testing/btest/Baseline/bifs.get_port_transport_proto/out

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 tcp
 udp
 icmp

testing/btest/Baseline/bifs.getsetenv/out

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 OK
 OK
 OK

testing/btest/Baseline/bifs.global_ids/out

@@ -1 +1,2 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 func

testing/btest/Baseline/bifs.global_sizes/out

@@ -1 +1,2 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 found zeek_init

testing/btest/Baseline/bifs.haversine_distance/out

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 5.8481e+03
 5.8481e+03
 1.9193e-02

testing/btest/Baseline/bifs.hexdump/out

@@ -1 +1,2 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 0000  61 62 63 ff 64 65 66 67  68 69 6a 6b 6c 6d 6e 6f  abc.defg hijklmno\x0a0010  70 71 72 73 74 75 76 77  78 79 7a                 pqrstuvw xyz\x0a

testing/btest/Baseline/bifs.hexstr_to_bytestring/.stderr

@@ -1 +1,2 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 error: Hex string 'a' has invalid length (not divisible by 2)

testing/btest/Baseline/bifs.hexstr_to_bytestring/out

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 04
 
 \x00

testing/btest/Baseline/bifs.hll_cardinality/.stderr

@@ -1 +1,2 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 error: incompatible HLL data type

testing/btest/Baseline/bifs.hll_cardinality/out

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 This value should be around 13:
 13.00129
 This value should be about 12:

testing/btest/Baseline/bifs.hll_cluster/manager-1..stdout

@@ -1,2 +1,3 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 This value should be about 21:
 21.003365

testing/btest/Baseline/bifs.hll_cluster/worker-1..stdout

@@ -1,2 +1,3 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 This value should be around 13:
 13.00129

testing/btest/Baseline/bifs.hll_cluster/worker-2..stdout

@@ -1,2 +1,3 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 This value should be about 12:
 12.001099

testing/btest/Baseline/bifs.hll_large_estimate/out

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 Ok error
 167377.950902
 Ok error

testing/btest/Baseline/bifs.identify_data/out

@@ -1,2 +1,3 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 text/plain
 image/png

testing/btest/Baseline/bifs.install_src_addr_filter/output

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 [orig_h=141.142.220.118, orig_p=48649/tcp, resp_h=208.80.152.118, resp_p=80/tcp]
 [orig_h=141.142.220.118, orig_p=49996/tcp, resp_h=208.80.152.3, resp_p=80/tcp]
 [orig_h=141.142.220.118, orig_p=49997/tcp, resp_h=208.80.152.3, resp_p=80/tcp]

testing/btest/Baseline/bifs.is_ascii/out

@@ -1,2 +1,3 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 F
 T

testing/btest/Baseline/bifs.is_local_interface/out

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 T
 F
 F

testing/btest/Baseline/bifs.is_port/out

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 T
 F
 F

testing/btest/Baseline/bifs.join_string/out

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 this__is__another__test
 thisisanothertest
 Test

testing/btest/Baseline/bifs.levenshtein_distance/out

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 1
 1
 1

testing/btest/Baseline/bifs.lowerupper/out

@@ -1,2 +1,3 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 this is a test
 THIS IS A TEST

testing/btest/Baseline/bifs.lstrip/out

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 www.zeek.org
 dcab
 

testing/btest/Baseline/bifs.mask_addr/output

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 128.0.0.0/1
 192.0.0.0/2
 224.0.0.0/3

testing/btest/Baseline/bifs.matching_subnets/output

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 {
 2607:f8b0:4008:807::/64,
 10.2.0.2/31,

testing/btest/Baseline/bifs.math/out

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 3.0
 2.0
 -4.0

testing/btest/Baseline/bifs.md5/output

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 f97c5d29941bfb1b2fdab0874906ab82
 7b0391feb2e0cd271f1cf39aafb4376f
 f97c5d29941bfb1b2fdab0874906ab82

testing/btest/Baseline/bifs.net_stats_trace/output

@@ -1 +1,2 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 [pkts_recvd=136, pkts_dropped=0, pkts_link=0, bytes_recvd=25260]

testing/btest/Baseline/bifs.netbios-functions/out

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 WORKGROUP
 27
 \x01\x02__MSBROWSE__\x02

testing/btest/Baseline/bifs.order/out

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 [5, 2, 8, 3]
 [1, 3, 0, 2]
 [5.0 hrs, 2.0 days, 1.0 sec, -7.0 mins]

testing/btest/Baseline/bifs.packet_sources/out

@@ -1 +1,2 @@
-[live=F, path=/Users/tim/Desktop/projects/zeek/testing/btest/Traces/http/get.trace, link_type=1, netmask=4294967295]
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+[live=F, path=<...>/get.trace, link_type=1, netmask=4294967295]

testing/btest/Baseline/bifs.parse_ftp/out

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 [h=192.168.0.2, p=257/tcp, valid=T]
 [h=192.168.0.2, p=257/tcp, valid=T]
 [h=fe80::12, p=1234/tcp, valid=T]

testing/btest/Baseline/bifs.piped_exec/output

@@ -1,2 +1,3 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 hello world
 foobar

testing/btest/Baseline/bifs.print_raw/out

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 "\\x07Էo"
 start "\\x07Էo"137T[9, 10] finish
 é

testing/btest/Baseline/bifs.ptr_name_to_addr/output

@@ -1,2 +1,3 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 2607:f8b0:4009:802::1012
 74.125.225.52

testing/btest/Baseline/bifs.rand/out

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 20
 484
 137

testing/btest/Baseline/bifs.rand/out.2

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 20
 484
 137

testing/btest/Baseline/bifs.rand/out.3

@@ -1 +1,2 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 F

testing/btest/Baseline/bifs.rand/out.4

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 0
 131
 755

testing/btest/Baseline/bifs.raw_bytes_to_v4_addr/out

@@ -1,2 +1,3 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 65.66.67.68
 0.0.0.0

testing/btest/Baseline/bifs.reading_traces/out1

@@ -1 +1,2 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 F

testing/btest/Baseline/bifs.reading_traces/out2

@@ -1 +1,2 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 T

testing/btest/Baseline/bifs.record_type_to_vector/out

@@ -1 +1,2 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 [, ct, str1]

testing/btest/Baseline/bifs.records_fields/out

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 [a=42, b=Foo, c=<uninitialized>, d=Bar, e=tt]
 {
 [a] = [type_name=count, log=F, value=42, default_val=<uninitialized>],

testing/btest/Baseline/bifs.remask_addr/output

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 1: 127.255.0.0
 2: 63.255.0.0
 3: 31.255.0.0

testing/btest/Baseline/bifs.resize/out

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 3
 5
 0

testing/btest/Baseline/bifs.reverse/out

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 !dlrow olleh
 hello world!
 risetovotesir

testing/btest/Baseline/bifs.rotate_file/out

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 file rotated
 15.0
 0.0

testing/btest/Baseline/bifs.rotate_file_by_name/out

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 file rotated
 15.0
 0.0

testing/btest/Baseline/bifs.routing0_data_to_addrs/output

@@ -1 +1,2 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 [2001:78:1:32::1, 2001:78:1:32::2]

testing/btest/Baseline/bifs.rstrip/out

@@ -1,3 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 https://www.zeek
 abcd