From acaaa0d36a8d7e2664f95d34ea57ed475ee1dcbc Mon Sep 17 00:00:00 2001
From: Vern Paxson <vern@corelight.com>
Date: Sun, 5 Sep 2021 11:29:08 -0700
Subject: [PATCH] fix race condition in btest output ordering

---
 .../btest/Baseline.zam/language.vector-coerce-expr2/error    | 2 ++
 .../btest/Baseline.zam/language.vector-coerce-expr2/output   | 1 -
 testing/btest/Baseline/language.vector-coerce-expr2/error    | 2 ++
 testing/btest/Baseline/language.vector-coerce-expr2/output   | 1 -
 testing/btest/language/vector-coerce-expr2.zeek              | 5 +++--
 5 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 testing/btest/Baseline.zam/language.vector-coerce-expr2/error
 create mode 100644 testing/btest/Baseline/language.vector-coerce-expr2/error

diff --git a/testing/btest/Baseline.zam/language.vector-coerce-expr2/error b/testing/btest/Baseline.zam/language.vector-coerce-expr2/error
new file mode 100644
index 0000000000..ddde92cde3
--- /dev/null
+++ b/testing/btest/Baseline.zam/language.vector-coerce-expr2/error
@@ -0,0 +1,2 @@
+### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
+runtime error in <...>/vector-coerce-expr2.zeek, line 50: overflow promoting from unsigned to signed arithmetic value
diff --git a/testing/btest/Baseline.zam/language.vector-coerce-expr2/output b/testing/btest/Baseline.zam/language.vector-coerce-expr2/output
index eeec3b12c8..b92f1ee707 100644
--- a/testing/btest/Baseline.zam/language.vector-coerce-expr2/output
+++ b/testing/btest/Baseline.zam/language.vector-coerce-expr2/output
@@ -1,5 +1,4 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
-runtime error in <...>/vector-coerce-expr2.zeek, line 49: overflow promoting from unsigned to signed arithmetic value
 [5.5, 5.2, -3.9, 20.0]
 [11, 5, , 107, , , 1046]
 [-2, -4, , -7, , -18, -999]
diff --git a/testing/btest/Baseline/language.vector-coerce-expr2/error b/testing/btest/Baseline/language.vector-coerce-expr2/error
new file mode 100644
index 0000000000..20ec5bb0c6
--- /dev/null
+++ b/testing/btest/Baseline/language.vector-coerce-expr2/error
@@ -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 and <...>/vector-coerce-expr2.zeek, line 50: overflow promoting from unsigned/double to signed arithmetic value (int and 18446744073709551615)
diff --git a/testing/btest/Baseline/language.vector-coerce-expr2/output b/testing/btest/Baseline/language.vector-coerce-expr2/output
index b450f8262a..d2ecf26c04 100644
--- a/testing/btest/Baseline/language.vector-coerce-expr2/output
+++ b/testing/btest/Baseline/language.vector-coerce-expr2/output
@@ -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 and <...>/vector-coerce-expr2.zeek, line 49: overflow promoting from unsigned/double to signed arithmetic value (int and 18446744073709551615)
 [5.5, 5.2, -3.9, 20.0]
 [11, 5, , 107, , , 1046]
 [-2, -4, , -7, , -18, -999]
diff --git a/testing/btest/language/vector-coerce-expr2.zeek b/testing/btest/language/vector-coerce-expr2.zeek
index 02361bd76f..96c4be43a4 100644
--- a/testing/btest/language/vector-coerce-expr2.zeek
+++ b/testing/btest/language/vector-coerce-expr2.zeek
@@ -1,5 +1,6 @@
-# @TEST-EXEC: zeek -b %INPUT >output 2>&1
-# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff output
+# @TEST-EXEC: zeek -b %INPUT >output 2>error
+# @TEST-EXEC: btest-diff output
+# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff error
 
 event zeek_init()
 	{