From a15d726f955a54767da7b1935c80f116d32591d0 Mon Sep 17 00:00:00 2001
From: Jon Siwek <jsiwek@corelight.com>
Date: Tue, 30 Mar 2021 16:03:14 -0700
Subject: [PATCH 1/4] Change a <sys/errno.h> include to <errno.h>

Some systems (e.g. Alpine) may warn that that the former is incorrect.
---
 src/ScannedFile.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ScannedFile.cc b/src/ScannedFile.cc
index 77a6f1cb60..c7c7cafb0e 100644
--- a/src/ScannedFile.cc
+++ b/src/ScannedFile.cc
@@ -1,6 +1,6 @@
 #include "zeek/ScannedFile.h"
 
-#include <sys/errno.h>
+#include <errno.h>
 #include <limits.h> // for PATH_MAX
 
 #include "zeek/DebugLogger.h"

From 8e47494dffd41b5f02a8969bb2daaf894ca4ac3f Mon Sep 17 00:00:00 2001
From: Jon Siwek <jsiwek@corelight.com>
Date: Tue, 30 Mar 2021 16:04:34 -0700
Subject: [PATCH 2/4] Remove newline-eof canonification attempt in
 diff-remove-timestamps

On Alpine (BusyBox `sed`), the previous `sed -e '$a\'` invocation always
added a newline, breaking most every diff.  There doesn't seem to be a
need to attempt normalizing EOF newlines at the moment and doing it that
way doesn't seem to be portable anyway.  If canonifiers need to be
portable, `sed` should be treated as a text-processing tool and POSIX
definition of text-file is zero or more newline-terminated
character-sequences, so if canonification of Baselines via `sed` is
required, those Baselines should always end with a newline to be
considered text files.  I.e. that's not the job of this canonifier, and
changing it also doesn't necessarily generalize since it could be
considered coincidental that diff-remove-timestamps in particular is the
default canonifier that's commonly used while there's still others that
also make use of `sed`.
---
 testing/scripts/diff-remove-timestamps | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/testing/scripts/diff-remove-timestamps b/testing/scripts/diff-remove-timestamps
index 5c5956a0ed..0bcc458739 100755
--- a/testing/scripts/diff-remove-timestamps
+++ b/testing/scripts/diff-remove-timestamps
@@ -9,6 +9,4 @@ else
    sed="sed -E"
 fi
 
-# $a\ adds a newline to the end of the file if it does not exist.
-# This unifies the behavior of BSD and GNU sed
-$sed -e 's/(^|[^0-9])([0-9]{9,10}\.[0-9]{1,8})/\1XXXXXXXXXX.XXXXXX/g' -e  's/^ *#(open|close).(19|20)..-..-..-..-..-..$/#\1 XXXX-XX-XX-XX-XX-XX/g' -e '$a\'
+$sed -e 's/(^|[^0-9])([0-9]{9,10}\.[0-9]{1,8})/\1XXXXXXXXXX.XXXXXX/g' -e  's/^ *#(open|close).(19|20)..-..-..-..-..-..$/#\1 XXXX-XX-XX-XX-XX-XX/g'

From 3e9ac00f21c8b98ff446615edb4928780fabe9c4 Mon Sep 17 00:00:00 2001
From: Jon Siwek <jsiwek@corelight.com>
Date: Tue, 30 Mar 2021 16:23:23 -0700
Subject: [PATCH 3/4] Separate stdout from stderr in btest baselines

Redirecting both to the same file can show platform-specific differences
(e.g. Alpine), likely due to different buffering defaults.
---
 testing/btest/Baseline/bifs.bloomfilter/err       |  7 +++++++
 testing/btest/Baseline/bifs.bloomfilter/output    |  6 ------
 testing/btest/Baseline/bifs.strptime/err          |  2 ++
 testing/btest/Baseline/bifs.strptime/out          |  1 -
 testing/btest/Baseline/core.init-error/err        |  3 +++
 testing/btest/Baseline/core.init-error/out        |  2 --
 testing/btest/Baseline/core.pcap.dumper/output    | 11 +++++++----
 .../Baseline/core.reporter-error-in-handler/err   |  3 +++
 .../core.reporter-error-in-handler/output         |  2 --
 .../btest/Baseline/language.common-mistakes/1.err |  2 ++
 .../btest/Baseline/language.common-mistakes/1.out |  1 -
 .../btest/Baseline/language.common-mistakes/2.err |  2 ++
 .../btest/Baseline/language.common-mistakes/2.out |  1 -
 .../btest/Baseline/language.common-mistakes/3.err |  2 ++
 .../btest/Baseline/language.common-mistakes/3.out |  1 -
 testing/btest/Baseline/language.invalid_index/err |  3 +++
 testing/btest/Baseline/language.invalid_index/out |  2 --
 testing/btest/Baseline/language.subnet-errors/err |  3 +++
 testing/btest/Baseline/language.subnet-errors/out |  2 --
 .../language.table-set-iterator-invalidation/err  |  5 +++++
 .../language.table-set-iterator-invalidation/out  |  4 ----
 .../Baseline/language.type-cast-error-dynamic/err |  4 ++++
 .../language.type-cast-error-dynamic/output       |  3 ---
 .../double_convert_failure1.err                   |  2 ++
 .../double_convert_failure1.out                   |  1 -
 .../double_convert_failure2.err                   |  2 ++
 .../double_convert_failure2.out                   |  1 -
 .../language.type-coerce-numerics/first_set.err   |  2 ++
 .../language.type-coerce-numerics/first_set.out   |  1 -
 .../int_convert_failure.err                       |  2 ++
 .../int_convert_failure.out                       |  1 -
 .../language.type-coerce-numerics/vectors.err     |  1 +
 .../Baseline/language.uninitialized-local2/err    |  2 ++
 .../Baseline/language.uninitialized-local2/out    |  1 -
 .../Baseline/language.uninitialized-local3/err    |  3 +++
 .../Baseline/language.uninitialized-local3/out    | 12 +++++-------
 .../.stdout                                       |  2 --
 .../err                                           |  3 +++
 testing/btest/bifs/bloomfilter.zeek               |  3 ++-
 testing/btest/bifs/strptime.zeek                  |  3 ++-
 testing/btest/core/init-error.zeek                |  3 ++-
 testing/btest/core/pcap/dumper.zeek               |  4 +++-
 testing/btest/core/reporter-error-in-handler.zeek |  3 ++-
 testing/btest/language/common-mistakes.zeek       |  9 ++++++---
 testing/btest/language/invalid_index.zeek         |  3 ++-
 testing/btest/language/subnet-errors.zeek         |  3 ++-
 .../language/table-set-iterator-invalidation.zeek |  3 ++-
 .../btest/language/type-cast-error-dynamic.zeek   |  3 ++-
 testing/btest/language/type-coerce-numerics.zeek  | 15 ++++++++++-----
 testing/btest/language/uninitialized-local2.zeek  |  3 ++-
 testing/btest/language/uninitialized-local3.zeek  |  3 ++-
 .../bifs/file_exists_lookup_file.zeek             |  3 ++-
 52 files changed, 106 insertions(+), 63 deletions(-)
 create mode 100644 testing/btest/Baseline/bifs.bloomfilter/err
 create mode 100644 testing/btest/Baseline/bifs.strptime/err
 create mode 100644 testing/btest/Baseline/core.init-error/err
 create mode 100644 testing/btest/Baseline/core.reporter-error-in-handler/err
 create mode 100644 testing/btest/Baseline/language.common-mistakes/1.err
 create mode 100644 testing/btest/Baseline/language.common-mistakes/2.err
 create mode 100644 testing/btest/Baseline/language.common-mistakes/3.err
 create mode 100644 testing/btest/Baseline/language.invalid_index/err
 create mode 100644 testing/btest/Baseline/language.subnet-errors/err
 create mode 100644 testing/btest/Baseline/language.table-set-iterator-invalidation/err
 create mode 100644 testing/btest/Baseline/language.type-cast-error-dynamic/err
 create mode 100644 testing/btest/Baseline/language.type-coerce-numerics/double_convert_failure1.err
 create mode 100644 testing/btest/Baseline/language.type-coerce-numerics/double_convert_failure2.err
 create mode 100644 testing/btest/Baseline/language.type-coerce-numerics/first_set.err
 create mode 100644 testing/btest/Baseline/language.type-coerce-numerics/int_convert_failure.err
 create mode 100644 testing/btest/Baseline/language.type-coerce-numerics/vectors.err
 create mode 100644 testing/btest/Baseline/language.uninitialized-local2/err
 create mode 100644 testing/btest/Baseline/language.uninitialized-local3/err
 create mode 100644 testing/btest/Baseline/scripts.base.frameworks.file-analysis.bifs.file_exists_lookup_file/err

diff --git a/testing/btest/Baseline/bifs.bloomfilter/err b/testing/btest/Baseline/bifs.bloomfilter/err
new file mode 100644
index 0000000000..2a4c6d7420
--- /dev/null
+++ b/testing/btest/Baseline/bifs.bloomfilter/err
@@ -0,0 +1,7 @@
+### 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
+error: incompatible Bloom filter types
+error: false-positive rate must take value between 0 and 1
+error: false-positive rate must take value between 0 and 1
diff --git a/testing/btest/Baseline/bifs.bloomfilter/output b/testing/btest/Baseline/bifs.bloomfilter/output
index 1bbe4592d2..2e6dfc8abe 100644
--- a/testing/btest/Baseline/bifs.bloomfilter/output
+++ b/testing/btest/Baseline/bifs.bloomfilter/output
@@ -1,10 +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
-error: incompatible Bloom filter types
-error: false-positive rate must take value between 0 and 1
-error: false-positive rate must take value between 0 and 1
 0
 1
 1
diff --git a/testing/btest/Baseline/bifs.strptime/err b/testing/btest/Baseline/bifs.strptime/err
new file mode 100644
index 0000000000..7770adb5ba
--- /dev/null
+++ b/testing/btest/Baseline/bifs.strptime/err
@@ -0,0 +1,2 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+warning: strptime conversion failed: fmt:%m d:1980-10-24
diff --git a/testing/btest/Baseline/bifs.strptime/out b/testing/btest/Baseline/bifs.strptime/out
index a6c49aa77c..8784f8dc3e 100644
--- a/testing/btest/Baseline/bifs.strptime/out
+++ b/testing/btest/Baseline/bifs.strptime/out
@@ -1,4 +1,3 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-warning: strptime conversion failed: fmt:%m d:1980-10-24
 XXXXXXXXXX.XXXXXX
 0.0
diff --git a/testing/btest/Baseline/core.init-error/err b/testing/btest/Baseline/core.init-error/err
new file mode 100644
index 0000000000..2d1ce60bf3
--- /dev/null
+++ b/testing/btest/Baseline/core.init-error/err
@@ -0,0 +1,3 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+expression error in <...>/init-error.zeek, line 16: no such index (v[10])
+fatal error: errors occurred while initializing
diff --git a/testing/btest/Baseline/core.init-error/out b/testing/btest/Baseline/core.init-error/out
index a8f510074e..14ab5a1282 100644
--- a/testing/btest/Baseline/core.init-error/out
+++ b/testing/btest/Baseline/core.init-error/out
@@ -1,6 +1,4 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-expression error in <...>/init-error.zeek, line 15: no such index (v[10])
-fatal error: errors occurred while initializing
 1st event
 2nd event
 3rd event
diff --git a/testing/btest/Baseline/core.pcap.dumper/output b/testing/btest/Baseline/core.pcap.dumper/output
index 9ccfcee235..0bfe0ff5ac 100644
--- a/testing/btest/Baseline/core.pcap.dumper/output
+++ b/testing/btest/Baseline/core.pcap.dumper/output
@@ -1,5 +1,8 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-2c2
-< 00000010  ff ff 00 00 01 00 00 00  1d a2 b2 4e 73 00 07 00  |...........Ns...|
----
-> 00000010  00 24 00 00 01 00 00 00  1d a2 b2 4e 73 00 07 00  |.$.........Ns...|
+@@ -1,5 +1,5 @@
+ 00000000  d4 c3 b2 a1 02 00 04 00  00 00 00 00 00 00 00 00  |................|
+-00000010  ff ff 00 00 01 00 00 00  1d a2 b2 4e 73 00 07 00  |...........Ns...|
++00000010  00 24 00 00 01 00 00 00  1d a2 b2 4e 73 00 07 00  |.$.........Ns...|
+ 00000020  4a 00 00 00 4a 00 00 00  52 54 00 12 35 02 08 00  |J...J...RT..5...|
+ 00000030  27 87 94 24 08 00 45 00  00 3c c1 d8 40 00 40 06  |'..$..E..<..@.@.|
+ 00000040  f1 12 0a 00 02 0f c0 96  bb 2b c0 82 00 50 01 28  |.........+...P.(|
diff --git a/testing/btest/Baseline/core.reporter-error-in-handler/err b/testing/btest/Baseline/core.reporter-error-in-handler/err
new file mode 100644
index 0000000000..1c7f00473e
--- /dev/null
+++ b/testing/btest/Baseline/core.reporter-error-in-handler/err
@@ -0,0 +1,3 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+expression error in <...>/reporter-error-in-handler.zeek, line 29: no such index (a[1])
+expression error in <...>/reporter-error-in-handler.zeek, line 23: no such index (a[2])
diff --git a/testing/btest/Baseline/core.reporter-error-in-handler/output b/testing/btest/Baseline/core.reporter-error-in-handler/output
index f233ff3d18..4ffc7f805d 100644
--- a/testing/btest/Baseline/core.reporter-error-in-handler/output
+++ b/testing/btest/Baseline/core.reporter-error-in-handler/output
@@ -1,4 +1,2 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-expression error in <...>/reporter-error-in-handler.zeek, line 28: no such index (a[1])
-expression error in <...>/reporter-error-in-handler.zeek, line 22: no such index (a[2])
 1st error printed on script level
diff --git a/testing/btest/Baseline/language.common-mistakes/1.err b/testing/btest/Baseline/language.common-mistakes/1.err
new file mode 100644
index 0000000000..571bb4a831
--- /dev/null
+++ b/testing/btest/Baseline/language.common-mistakes/1.err
@@ -0,0 +1,2 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+expression error in ./1.zeek, line 9: field value missing (mr$f)
diff --git a/testing/btest/Baseline/language.common-mistakes/1.out b/testing/btest/Baseline/language.common-mistakes/1.out
index 5496a099cd..9169b4f45e 100644
--- a/testing/btest/Baseline/language.common-mistakes/1.out
+++ b/testing/btest/Baseline/language.common-mistakes/1.out
@@ -1,5 +1,4 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-expression error in ./1.zeek, line 9: field value missing (mr$f)
 bar start
 foo start
 other zeek_init
diff --git a/testing/btest/Baseline/language.common-mistakes/2.err b/testing/btest/Baseline/language.common-mistakes/2.err
new file mode 100644
index 0000000000..c8e7c86b12
--- /dev/null
+++ b/testing/btest/Baseline/language.common-mistakes/2.err
@@ -0,0 +1,2 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+expression error in ./2.zeek, line 7: no such index (t[nope])
diff --git a/testing/btest/Baseline/language.common-mistakes/2.out b/testing/btest/Baseline/language.common-mistakes/2.out
index db87dbf7ec..8e1dd6eefb 100644
--- a/testing/btest/Baseline/language.common-mistakes/2.out
+++ b/testing/btest/Baseline/language.common-mistakes/2.out
@@ -1,3 +1,2 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-expression error in ./2.zeek, line 7: no such index (t[nope])
 in foo
diff --git a/testing/btest/Baseline/language.common-mistakes/3.err b/testing/btest/Baseline/language.common-mistakes/3.err
new file mode 100644
index 0000000000..41ae45fdce
--- /dev/null
+++ b/testing/btest/Baseline/language.common-mistakes/3.err
@@ -0,0 +1,2 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+expression error in ./3.zeek, line 5: type-checking failed in vector append (v += ok)
diff --git a/testing/btest/Baseline/language.common-mistakes/3.out b/testing/btest/Baseline/language.common-mistakes/3.out
index c6fc21fcc3..8e1dd6eefb 100644
--- a/testing/btest/Baseline/language.common-mistakes/3.out
+++ b/testing/btest/Baseline/language.common-mistakes/3.out
@@ -1,3 +1,2 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-expression error in ./3.zeek, line 5: type-checking failed in vector append (v += ok)
 in foo
diff --git a/testing/btest/Baseline/language.invalid_index/err b/testing/btest/Baseline/language.invalid_index/err
new file mode 100644
index 0000000000..5910767e32
--- /dev/null
+++ b/testing/btest/Baseline/language.invalid_index/err
@@ -0,0 +1,3 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+expression error in <...>/invalid_index.zeek, line 11: no such index (foo[1])
+expression error in <...>/invalid_index.zeek, line 17: no such index (foo2[1])
diff --git a/testing/btest/Baseline/language.invalid_index/out b/testing/btest/Baseline/language.invalid_index/out
index 80fe32a510..a36cdc6472 100644
--- a/testing/btest/Baseline/language.invalid_index/out
+++ b/testing/btest/Baseline/language.invalid_index/out
@@ -1,6 +1,4 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-expression error in <...>/invalid_index.zeek, line 10: no such index (foo[1])
-expression error in <...>/invalid_index.zeek, line 16: no such index (foo2[1])
 foo[0], 42
 foo2[0], 13
 done
diff --git a/testing/btest/Baseline/language.subnet-errors/err b/testing/btest/Baseline/language.subnet-errors/err
new file mode 100644
index 0000000000..9bd82b682e
--- /dev/null
+++ b/testing/btest/Baseline/language.subnet-errors/err
@@ -0,0 +1,3 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+expression error in <...>/subnet-errors.zeek, line 10: bad IPv4 subnet prefix length: 33 (1.2.3.4 / i)
+expression error in <...>/subnet-errors.zeek, line 19: bad IPv6 subnet prefix length: 129 (:: / i)
diff --git a/testing/btest/Baseline/language.subnet-errors/out b/testing/btest/Baseline/language.subnet-errors/out
index 06dac194d1..b7c2e2e895 100644
--- a/testing/btest/Baseline/language.subnet-errors/out
+++ b/testing/btest/Baseline/language.subnet-errors/out
@@ -1,6 +1,4 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-expression error in <...>/subnet-errors.zeek, line 9: bad IPv4 subnet prefix length: 33 (1.2.3.4 / i)
-expression error in <...>/subnet-errors.zeek, line 18: bad IPv6 subnet prefix length: 129 (:: / i)
 1.2.3.4/32
 ::/128
 init last
diff --git a/testing/btest/Baseline/language.table-set-iterator-invalidation/err b/testing/btest/Baseline/language.table-set-iterator-invalidation/err
new file mode 100644
index 0000000000..e33c980fc3
--- /dev/null
+++ b/testing/btest/Baseline/language.table-set-iterator-invalidation/err
@@ -0,0 +1,5 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+warning in <...>/table-set-iterator-invalidation.zeek, line 22: possible loop/iterator invalidation caused by expression: t[4]
+warning in <...>/table-set-iterator-invalidation.zeek, line 31: possible loop/iterator invalidation caused by expression: t[4]
+warning in <...>/table-set-iterator-invalidation.zeek, line 54: possible loop/iterator invalidation caused by expression: s[4]
+warning in <...>/table-set-iterator-invalidation.zeek, line 63: possible loop/iterator invalidation caused by expression: s[4]
diff --git a/testing/btest/Baseline/language.table-set-iterator-invalidation/out b/testing/btest/Baseline/language.table-set-iterator-invalidation/out
index 38cadd94a2..3c6cc09e27 100644
--- a/testing/btest/Baseline/language.table-set-iterator-invalidation/out
+++ b/testing/btest/Baseline/language.table-set-iterator-invalidation/out
@@ -1,8 +1,4 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-warning in <...>/table-set-iterator-invalidation.zeek, line 21: possible loop/iterator invalidation caused by expression: t[4]
-warning in <...>/table-set-iterator-invalidation.zeek, line 30: possible loop/iterator invalidation caused by expression: t[4]
-warning in <...>/table-set-iterator-invalidation.zeek, line 53: possible loop/iterator invalidation caused by expression: s[4]
-warning in <...>/table-set-iterator-invalidation.zeek, line 62: possible loop/iterator invalidation caused by expression: s[4]
 {
 [2] = 2,
 [1] = 1,
diff --git a/testing/btest/Baseline/language.type-cast-error-dynamic/err b/testing/btest/Baseline/language.type-cast-error-dynamic/err
new file mode 100644
index 0000000000..bc7a985010
--- /dev/null
+++ b/testing/btest/Baseline/language.type-cast-error-dynamic/err
@@ -0,0 +1,4 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+expression error in <...>/type-cast-error-dynamic.zeek, line 12: invalid cast of value with type 'count' to type 'string' (a as string)
+expression error in <...>/type-cast-error-dynamic.zeek, line 12: invalid cast of value with type 'record { a:addr; b:port; }' to type 'string' (a as string)
+expression error in <...>/type-cast-error-dynamic.zeek, line 12: invalid cast of value with type 'record { data:opaque of Broker::Data &optional; }' to type 'string' (nil $data field) (a as string)
diff --git a/testing/btest/Baseline/language.type-cast-error-dynamic/output b/testing/btest/Baseline/language.type-cast-error-dynamic/output
index bf6438e3e6..ec70675fe2 100644
--- a/testing/btest/Baseline/language.type-cast-error-dynamic/output
+++ b/testing/btest/Baseline/language.type-cast-error-dynamic/output
@@ -1,5 +1,2 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-expression error in <...>/type-cast-error-dynamic.zeek, line 11: invalid cast of value with type 'count' to type 'string' (a as string)
-expression error in <...>/type-cast-error-dynamic.zeek, line 11: invalid cast of value with type 'record { a:addr; b:port; }' to type 'string' (a as string)
-expression error in <...>/type-cast-error-dynamic.zeek, line 11: invalid cast of value with type 'record { data:opaque of Broker::Data &optional; }' to type 'string' (nil $data field) (a as string)
 data is string, F
diff --git a/testing/btest/Baseline/language.type-coerce-numerics/double_convert_failure1.err b/testing/btest/Baseline/language.type-coerce-numerics/double_convert_failure1.err
new file mode 100644
index 0000000000..833eb76999
--- /dev/null
+++ b/testing/btest/Baseline/language.type-coerce-numerics/double_convert_failure1.err
@@ -0,0 +1,2 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+error in ./double_convert_failure1.zeek, line 7 and double: type clash for field "cc" ((coerce [$cc=5.0] to myrecord) and double)
diff --git a/testing/btest/Baseline/language.type-coerce-numerics/double_convert_failure1.out b/testing/btest/Baseline/language.type-coerce-numerics/double_convert_failure1.out
index 833eb76999..49d861c74c 100644
--- a/testing/btest/Baseline/language.type-coerce-numerics/double_convert_failure1.out
+++ b/testing/btest/Baseline/language.type-coerce-numerics/double_convert_failure1.out
@@ -1,2 +1 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-error in ./double_convert_failure1.zeek, line 7 and double: type clash for field "cc" ((coerce [$cc=5.0] to myrecord) and double)
diff --git a/testing/btest/Baseline/language.type-coerce-numerics/double_convert_failure2.err b/testing/btest/Baseline/language.type-coerce-numerics/double_convert_failure2.err
new file mode 100644
index 0000000000..c89e0282e1
--- /dev/null
+++ b/testing/btest/Baseline/language.type-coerce-numerics/double_convert_failure2.err
@@ -0,0 +1,2 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+error in ./double_convert_failure2.zeek, line 7 and double: type clash for field "cc" ((coerce [$cc=-5.0] to myrecord) and double)
diff --git a/testing/btest/Baseline/language.type-coerce-numerics/double_convert_failure2.out b/testing/btest/Baseline/language.type-coerce-numerics/double_convert_failure2.out
index c89e0282e1..49d861c74c 100644
--- a/testing/btest/Baseline/language.type-coerce-numerics/double_convert_failure2.out
+++ b/testing/btest/Baseline/language.type-coerce-numerics/double_convert_failure2.out
@@ -1,2 +1 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-error in ./double_convert_failure2.zeek, line 7 and double: type clash for field "cc" ((coerce [$cc=-5.0] to myrecord) and double)
diff --git a/testing/btest/Baseline/language.type-coerce-numerics/first_set.err b/testing/btest/Baseline/language.type-coerce-numerics/first_set.err
new file mode 100644
index 0000000000..20e1c94aae
--- /dev/null
+++ b/testing/btest/Baseline/language.type-coerce-numerics/first_set.err
@@ -0,0 +1,2 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+error in int: overflow promoting from unsigned/double to signed arithmetic value (int and 9223372036854775808)
diff --git a/testing/btest/Baseline/language.type-coerce-numerics/first_set.out b/testing/btest/Baseline/language.type-coerce-numerics/first_set.out
index 4809986d53..b31869c4eb 100644
--- a/testing/btest/Baseline/language.type-coerce-numerics/first_set.out
+++ b/testing/btest/Baseline/language.type-coerce-numerics/first_set.out
@@ -1,5 +1,4 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-error in int: overflow promoting from unsigned/double to signed arithmetic value (int and 9223372036854775808)
 3
 int
 4
diff --git a/testing/btest/Baseline/language.type-coerce-numerics/int_convert_failure.err b/testing/btest/Baseline/language.type-coerce-numerics/int_convert_failure.err
new file mode 100644
index 0000000000..9bca49e323
--- /dev/null
+++ b/testing/btest/Baseline/language.type-coerce-numerics/int_convert_failure.err
@@ -0,0 +1,2 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+error in ./int_convert_failure.zeek, line 7 and int: type clash for field "cc" ((coerce [$cc=-5] to myrecord) and int)
diff --git a/testing/btest/Baseline/language.type-coerce-numerics/int_convert_failure.out b/testing/btest/Baseline/language.type-coerce-numerics/int_convert_failure.out
index 9bca49e323..49d861c74c 100644
--- a/testing/btest/Baseline/language.type-coerce-numerics/int_convert_failure.out
+++ b/testing/btest/Baseline/language.type-coerce-numerics/int_convert_failure.out
@@ -1,2 +1 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-error in ./int_convert_failure.zeek, line 7 and int: type clash for field "cc" ((coerce [$cc=-5] to myrecord) and int)
diff --git a/testing/btest/Baseline/language.type-coerce-numerics/vectors.err b/testing/btest/Baseline/language.type-coerce-numerics/vectors.err
new file mode 100644
index 0000000000..49d861c74c
--- /dev/null
+++ b/testing/btest/Baseline/language.type-coerce-numerics/vectors.err
@@ -0,0 +1 @@
+### 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/language.uninitialized-local2/err b/testing/btest/Baseline/language.uninitialized-local2/err
new file mode 100644
index 0000000000..bf4ff14005
--- /dev/null
+++ b/testing/btest/Baseline/language.uninitialized-local2/err
@@ -0,0 +1,2 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+expression error in <...>/uninitialized-local2.zeek, line 20: value used but not set (var_b)
diff --git a/testing/btest/Baseline/language.uninitialized-local2/out b/testing/btest/Baseline/language.uninitialized-local2/out
index 8d041a13c0..ba5c5cef5e 100644
--- a/testing/btest/Baseline/language.uninitialized-local2/out
+++ b/testing/btest/Baseline/language.uninitialized-local2/out
@@ -1,3 +1,2 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-expression error in <...>/uninitialized-local2.zeek, line 19: value used but not set (var_b)
 var_a is, baz
diff --git a/testing/btest/Baseline/language.uninitialized-local3/err b/testing/btest/Baseline/language.uninitialized-local3/err
new file mode 100644
index 0000000000..ae81d66dbd
--- /dev/null
+++ b/testing/btest/Baseline/language.uninitialized-local3/err
@@ -0,0 +1,3 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+warning in <...>/uninitialized-local3.zeek, line 39: possibly used without definition (x4)
+expression error in <...>/uninitialized-local3.zeek, line 39: value used but not set (x4)
diff --git a/testing/btest/Baseline/language.uninitialized-local3/out b/testing/btest/Baseline/language.uninitialized-local3/out
index e65bf87f36..ee2f49d506 100644
--- a/testing/btest/Baseline/language.uninitialized-local3/out
+++ b/testing/btest/Baseline/language.uninitialized-local3/out
@@ -1,11 +1,9 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-warning in <...>/uninitialized-local3.zeek, line 38: possibly used without definition (x4)
-expression error in <...>/uninitialized-local3.zeek, line 38: value used but not set (x4)
-x$a (x <...>/uninitialized-local3.zeek, line 20) possibly used without being set
-x$e (x <...>/uninitialized-local3.zeek, line 20) possibly used without being set
-x$e (x <...>/uninitialized-local3.zeek, line 24) possibly used without being set
-x2$worries$a (x2 <...>/uninitialized-local3.zeek, line 27) possibly used without being set
-x2$worries$e (x2 <...>/uninitialized-local3.zeek, line 27) possibly used without being set
+x$a (x <...>/uninitialized-local3.zeek, line 21) possibly used without being set
+x$e (x <...>/uninitialized-local3.zeek, line 21) possibly used without being set
+x$e (x <...>/uninitialized-local3.zeek, line 25) possibly used without being set
+x2$worries$a (x2 <...>/uninitialized-local3.zeek, line 28) possibly used without being set
+x2$worries$e (x2 <...>/uninitialized-local3.zeek, line 28) possibly used without being set
 [a=<uninitialized>, b=<uninitialized>, c=9, d=<uninitialized>, e=<uninitialized>]
 [a=<uninitialized>, b=<uninitialized>, c=9, d=<uninitialized>, e=<uninitialized>]
 [no_worries=[a=<uninitialized>, b=<uninitialized>, c=9, d=<uninitialized>, e=<uninitialized>], worries=[a=<uninitialized>, b=<uninitialized>, c=9, d=<uninitialized>, e=<uninitialized>]]
diff --git a/testing/btest/Baseline/scripts.base.frameworks.file-analysis.bifs.file_exists_lookup_file/.stdout b/testing/btest/Baseline/scripts.base.frameworks.file-analysis.bifs.file_exists_lookup_file/.stdout
index 4ac2117737..ccf66e3400 100644
--- a/testing/btest/Baseline/scripts.base.frameworks.file-analysis.bifs.file_exists_lookup_file/.stdout
+++ b/testing/btest/Baseline/scripts.base.frameworks.file-analysis.bifs.file_exists_lookup_file/.stdout
@@ -1,6 +1,4 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-error: file ID asdf not a known file
-warning: non-void function returning without a value: Files::lookup_file
 This should fail but not crash
 This should return F
 F
diff --git a/testing/btest/Baseline/scripts.base.frameworks.file-analysis.bifs.file_exists_lookup_file/err b/testing/btest/Baseline/scripts.base.frameworks.file-analysis.bifs.file_exists_lookup_file/err
new file mode 100644
index 0000000000..f92621dcef
--- /dev/null
+++ b/testing/btest/Baseline/scripts.base.frameworks.file-analysis.bifs.file_exists_lookup_file/err
@@ -0,0 +1,3 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+error: file ID asdf not a known file
+warning: non-void function returning without a value: Files::lookup_file
diff --git a/testing/btest/bifs/bloomfilter.zeek b/testing/btest/bifs/bloomfilter.zeek
index c0ccbd7080..26b5cdbf5f 100644
--- a/testing/btest/bifs/bloomfilter.zeek
+++ b/testing/btest/bifs/bloomfilter.zeek
@@ -1,5 +1,6 @@
-# @TEST-EXEC: zeek -b %INPUT >output 2>&1
+# @TEST-EXEC: zeek -b %INPUT >output 2>err
 # @TEST-EXEC: btest-diff output
+# @TEST-EXEC: btest-diff err
 
 function test_basic_bloom_filter()
   {
diff --git a/testing/btest/bifs/strptime.zeek b/testing/btest/bifs/strptime.zeek
index 3923ced4c0..e870b5c0f1 100644
--- a/testing/btest/bifs/strptime.zeek
+++ b/testing/btest/bifs/strptime.zeek
@@ -1,6 +1,7 @@
 #
-# @TEST-EXEC: zeek -b %INPUT >out 2>&1
+# @TEST-EXEC: zeek -b %INPUT >out 2>err
 # @TEST-EXEC: btest-diff out
+# @TEST-EXEC: btest-diff err
 
 event zeek_init()
 	{
diff --git a/testing/btest/core/init-error.zeek b/testing/btest/core/init-error.zeek
index 82226e9dfa..70c9239bad 100644
--- a/testing/btest/core/init-error.zeek
+++ b/testing/btest/core/init-error.zeek
@@ -1,7 +1,8 @@
 # The default is for an initialization error to be a hard failure.
 
-# @TEST-EXEC-FAIL: unset ZEEK_ALLOW_INIT_ERRORS && zeek -b %INPUT >out 2>&1
+# @TEST-EXEC-FAIL: unset ZEEK_ALLOW_INIT_ERRORS && zeek -b %INPUT >out 2>err
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff out
+# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff err
 
 event zeek_init() &priority=10
 	{
diff --git a/testing/btest/core/pcap/dumper.zeek b/testing/btest/core/pcap/dumper.zeek
index b53c01bc37..21c2148a3b 100644
--- a/testing/btest/core/pcap/dumper.zeek
+++ b/testing/btest/core/pcap/dumper.zeek
@@ -2,7 +2,9 @@
 # @TEST-EXEC: zeek -b -r $TRACES/workshop_2011_browse.trace -w dump
 # @TEST-EXEC: hexdump -C $TRACES/workshop_2011_browse.trace >1
 # @TEST-EXEC: hexdump -C dump >2
-# @TEST-EXEC: diff 1 2 >output || true
+# @TEST-EXEC: diff -U3 1 2 >diff.output || true
+# Remove first two lines of diff since they may contain timestamps
+# @TEST-EXEC: awk 'NR>2' diff.output >output
 
 # Note that we're diff'ing the diff because there is an expected
 # difference in the pcaps: namely, the snaplen setting stored in the
diff --git a/testing/btest/core/reporter-error-in-handler.zeek b/testing/btest/core/reporter-error-in-handler.zeek
index 398c275c32..0b15e445b5 100644
--- a/testing/btest/core/reporter-error-in-handler.zeek
+++ b/testing/btest/core/reporter-error-in-handler.zeek
@@ -2,8 +2,9 @@
 # This test procudes a recursive error: the error handler is itself broken. Rather
 # than looping indefinitly, the error inside the handler should reported to stderr.
 #
-# @TEST-EXEC: zeek -b %INPUT >output 2>&1
+# @TEST-EXEC: zeek -b %INPUT >output 2>err
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff output
+# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff err
 
 global a: table[count] of count;
 
diff --git a/testing/btest/language/common-mistakes.zeek b/testing/btest/language/common-mistakes.zeek
index b829b5315b..b810dd22ea 100644
--- a/testing/btest/language/common-mistakes.zeek
+++ b/testing/btest/language/common-mistakes.zeek
@@ -2,14 +2,17 @@
 # handled internally by way of throwing an exception to unwind out
 # of the current event handler body.
 
-# @TEST-EXEC: zeek -b 1.zeek >1.out 2>&1
+# @TEST-EXEC: zeek -b 1.zeek >1.out 2>1.err
 # @TEST-EXEC: btest-diff 1.out
+# @TEST-EXEC: btest-diff 1.err
 
-# @TEST-EXEC: zeek -b 2.zeek >2.out 2>&1
+# @TEST-EXEC: zeek -b 2.zeek >2.out 2>2.err
 # @TEST-EXEC: btest-diff 2.out
+# @TEST-EXEC: btest-diff 2.err
 
-# @TEST-EXEC: zeek -b 3.zeek >3.out 2>&1
+# @TEST-EXEC: zeek -b 3.zeek >3.out 2>3.err
 # @TEST-EXEC: btest-diff 3.out
+# @TEST-EXEC: btest-diff 3.err
 
 @TEST-START-FILE 1.zeek
 type myrec: record {
diff --git a/testing/btest/language/invalid_index.zeek b/testing/btest/language/invalid_index.zeek
index 80f294c68b..831de104df 100644
--- a/testing/btest/language/invalid_index.zeek
+++ b/testing/btest/language/invalid_index.zeek
@@ -1,5 +1,6 @@
-# @TEST-EXEC: zeek -b %INPUT >out 2>&1
+# @TEST-EXEC: zeek -b %INPUT >out 2>err
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff out
+# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff err
 
 global foo: vector of count = { 42 };
 global foo2: table[count] of count = { [0] = 13 };
diff --git a/testing/btest/language/subnet-errors.zeek b/testing/btest/language/subnet-errors.zeek
index 875817c433..4226232cb3 100644
--- a/testing/btest/language/subnet-errors.zeek
+++ b/testing/btest/language/subnet-errors.zeek
@@ -1,5 +1,6 @@
-# @TEST-EXEC: zeek -b %INPUT >out 2>&1
+# @TEST-EXEC: zeek -b %INPUT >out 2>err
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff out
+# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff err
 
 event zeek_init()
 	{
diff --git a/testing/btest/language/table-set-iterator-invalidation.zeek b/testing/btest/language/table-set-iterator-invalidation.zeek
index aee45a6cea..6347c69125 100644
--- a/testing/btest/language/table-set-iterator-invalidation.zeek
+++ b/testing/btest/language/table-set-iterator-invalidation.zeek
@@ -1,5 +1,6 @@
-# @TEST-EXEC: zeek -b %INPUT >out 2>&1
+# @TEST-EXEC: zeek -b %INPUT >out 2>err
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff out
+# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff err
 
 # Note that while modifying container membership during for-loop iteration is
 # supposed to be undefined-behavior, it should be practically ok to have this
diff --git a/testing/btest/language/type-cast-error-dynamic.zeek b/testing/btest/language/type-cast-error-dynamic.zeek
index 1edf9e3d2a..c636eee0b8 100644
--- a/testing/btest/language/type-cast-error-dynamic.zeek
+++ b/testing/btest/language/type-cast-error-dynamic.zeek
@@ -1,5 +1,6 @@
-# @TEST-EXEC: zeek -b %INPUT >output 2>&1
+# @TEST-EXEC: zeek -b %INPUT >output 2>err
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff output
+# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff err
 
 type X: record  {
     a: addr;
diff --git a/testing/btest/language/type-coerce-numerics.zeek b/testing/btest/language/type-coerce-numerics.zeek
index 7633c02b62..d31d877b35 100644
--- a/testing/btest/language/type-coerce-numerics.zeek
+++ b/testing/btest/language/type-coerce-numerics.zeek
@@ -1,17 +1,22 @@
-# @TEST-EXEC: zeek -b first_set.zeek >first_set.out 2>&1
+# @TEST-EXEC: zeek -b first_set.zeek >first_set.out 2>first_set.err
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff first_set.out
+# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff first_set.err
 
-# @TEST-EXEC-FAIL: zeek -b double_convert_failure1.zeek >double_convert_failure1.out 2>&1
+# @TEST-EXEC-FAIL: zeek -b double_convert_failure1.zeek >double_convert_failure1.out 2>double_convert_failure1.err
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff double_convert_failure1.out
+# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff double_convert_failure1.err
 
-# @TEST-EXEC-FAIL: zeek -b double_convert_failure2.zeek >double_convert_failure2.out 2>&1
+# @TEST-EXEC-FAIL: zeek -b double_convert_failure2.zeek >double_convert_failure2.out 2>double_convert_failure2.err
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff double_convert_failure2.out
+# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff double_convert_failure2.err
 
-# @TEST-EXEC-FAIL: zeek -b int_convert_failure.zeek >int_convert_failure.out 2>&1
+# @TEST-EXEC-FAIL: zeek -b int_convert_failure.zeek >int_convert_failure.out 2>int_convert_failure.err
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff int_convert_failure.out
+# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff int_convert_failure.err
 
-# @TEST-EXEC: zeek -b vectors.zeek >vectors.out 2>&1
+# @TEST-EXEC: zeek -b vectors.zeek >vectors.out 2>vectors.err
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff vectors.out
+# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff vectors.err
 
 @TEST-START-FILE first_set.zeek
 type myrecord : record {
diff --git a/testing/btest/language/uninitialized-local2.zeek b/testing/btest/language/uninitialized-local2.zeek
index 4b8f0c8275..118ab77c83 100644
--- a/testing/btest/language/uninitialized-local2.zeek
+++ b/testing/btest/language/uninitialized-local2.zeek
@@ -1,5 +1,6 @@
-# @TEST-EXEC: zeek -b %INPUT >out 2>&1
+# @TEST-EXEC: zeek -b %INPUT >out 2>err
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff out
+# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff err
 
 event test()
 	{
diff --git a/testing/btest/language/uninitialized-local3.zeek b/testing/btest/language/uninitialized-local3.zeek
index f3aae38f5b..79629d2138 100644
--- a/testing/btest/language/uninitialized-local3.zeek
+++ b/testing/btest/language/uninitialized-local3.zeek
@@ -1,5 +1,6 @@
-# @TEST-EXEC: ZEEK_USAGE_ISSUES=2 zeek -b %INPUT >out 2>&1
+# @TEST-EXEC: ZEEK_USAGE_ISSUES=2 zeek -b %INPUT >out 2>err
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff out
+# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff err
 
 type r: record {
 	a: count;
diff --git a/testing/btest/scripts/base/frameworks/file-analysis/bifs/file_exists_lookup_file.zeek b/testing/btest/scripts/base/frameworks/file-analysis/bifs/file_exists_lookup_file.zeek
index 1a8c6e27a1..07e2cccbea 100644
--- a/testing/btest/scripts/base/frameworks/file-analysis/bifs/file_exists_lookup_file.zeek
+++ b/testing/btest/scripts/base/frameworks/file-analysis/bifs/file_exists_lookup_file.zeek
@@ -1,5 +1,6 @@
-# @TEST-EXEC: zeek -b -r $TRACES/http/get.trace %INPUT 2>&1
+# @TEST-EXEC: zeek -b -r $TRACES/http/get.trace %INPUT 2>err
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff .stdout
+# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff err
 
 @load base/protocols/http
 

From 3f95abd0dd770f7f5d6ba51681d6f09801038cae Mon Sep 17 00:00:00 2001
From: Jon Siwek <jsiwek@corelight.com>
Date: Tue, 30 Mar 2021 16:36:54 -0700
Subject: [PATCH 4/4] Add CI task for Alpine Linux

---
 .cirrus.yml          |  9 +++++++++
 ci/alpine/Dockerfile | 23 +++++++++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 ci/alpine/Dockerfile

diff --git a/.cirrus.yml b/.cirrus.yml
index 6cde730bb3..cd7a541d71 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -182,6 +182,15 @@ ubuntu16_task:
     << : *RESOURCES_TEMPLATE
   << : *CI_TEMPLATE
 
+alpine_task:
+  container:
+    # Alpine releases typically happen every 6 months w/ support for 2 years.
+    # The Dockerfile simply tracks latest Alpine release and shouldn't
+    # generally need updating based on particular Alpine release timelines.
+    dockerfile: ci/alpine/Dockerfile
+    << : *RESOURCES_TEMPLATE
+  << : *CI_TEMPLATE
+
 # Apple doesn't publish official long-term support timelines.
 # We aim to support both the current and previous macOS release.
 macos_big_sur_task:
diff --git a/ci/alpine/Dockerfile b/ci/alpine/Dockerfile
new file mode 100644
index 0000000000..5239c957ff
--- /dev/null
+++ b/ci/alpine/Dockerfile
@@ -0,0 +1,23 @@
+FROM alpine:latest
+
+RUN apk add --no-cache \
+  cmake \
+  make \
+  g++ \
+  python3 \
+  python3-dev \
+  flex \
+  bison \
+  libpcap-dev \
+  openssl-dev \
+  zlib-dev \
+  swig \
+  bash \
+  bsd-compat-headers \
+  linux-headers \
+  fts-dev \
+  git \
+  curl \
+  py3-pip
+
+RUN pip3 install junit2html