Merge remote-tracking branch 'origin/topic/jsiwek/ci-alpine'

* origin/topic/jsiwek/ci-alpine:
  Add CI task for Alpine Linux
  Separate stdout from stderr in btest baselines
  Remove newline-eof canonification attempt in diff-remove-timestamps
  Change a <sys/errno.h> include to <errno.h>

.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:

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

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"

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

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

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

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

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

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

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
+@@ -1,5 +1,5 @@
-< 00000010  ff ff 00 00 01 00 00 00  1d a2 b2 4e 73 00 07 00  |...........Ns...|
+ 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...|
++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.(|

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])

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

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)

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

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])

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

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)

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

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])

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

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)

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

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]

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,

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)

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

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)

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)

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)

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)

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)

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

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)

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)

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.

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)

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

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)

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)
+x$a (x <...>/uninitialized-local3.zeek, line 21) possibly used without being set
-expression error in <...>/uninitialized-local3.zeek, line 38: value used but not set (x4)
+x$e (x <...>/uninitialized-local3.zeek, line 21) possibly used without being set
-x$a (x <...>/uninitialized-local3.zeek, line 20) possibly used without being set
+x$e (x <...>/uninitialized-local3.zeek, line 25) possibly used without being set
-x$e (x <...>/uninitialized-local3.zeek, line 20) possibly used without being set
+x2$worries$a (x2 <...>/uninitialized-local3.zeek, line 28) possibly used without being set
-x$e (x <...>/uninitialized-local3.zeek, line 24) possibly used without being set
+x2$worries$e (x2 <...>/uninitialized-local3.zeek, line 28) 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
 [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>]]

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

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

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()
   {

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()
 	{

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
 	{

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

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;
 

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 {

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 };

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()
 	{

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

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;

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 {

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()
 	{

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;

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
 

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.
+$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'
-# 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\'