From b6b84848190150cc199d92f052c98112ea043e90 Mon Sep 17 00:00:00 2001
From: Vern Paxson <vern@corelight.com>
Date: Sun, 31 Aug 2025 09:04:32 -0700
Subject: [PATCH] annotate a number of BTests as unsuited for -O gen-C++
 testing due to multiple Zeek runs

---
 testing/btest/broker/peering-directionality.zeek             | 4 ++++
 testing/btest/broker/publish-errors.zeek                     | 4 ++++
 testing/btest/broker/remote_event_vector_any.zeek            | 4 ++++
 testing/btest/broker/remote_id.zeek                          | 4 ++++
 testing/btest/core/discarder.zeek                            | 3 +++
 testing/btest/core/load-prefixes.zeek                        | 5 +++++
 testing/btest/coverage/zeek-profiler-file.zeek               | 4 ++++
 testing/btest/language/at-dir.zeek                           | 4 ++++
 .../scripts/base/files/x509/x509_check_cert_hostname.zeek    | 3 +++
 .../base/frameworks/cluster/custom_pool_exclusivity.zeek     | 4 ++++
 testing/btest/scripts/base/frameworks/control/id_value.zeek  | 4 ++++
 .../btest/scripts/base/frameworks/netcontrol/acld-hook.zeek  | 4 ++++
 testing/btest/scripts/base/frameworks/netcontrol/acld.zeek   | 4 ++++
 testing/btest/scripts/base/frameworks/netcontrol/broker.zeek | 4 ++++
 .../btest/scripts/base/frameworks/openflow/broker-basic.zeek | 4 ++++
 15 files changed, 59 insertions(+)

diff --git a/testing/btest/broker/peering-directionality.zeek b/testing/btest/broker/peering-directionality.zeek
index 080ee7224b..fd68d70266 100644
--- a/testing/btest/broker/peering-directionality.zeek
+++ b/testing/btest/broker/peering-directionality.zeek
@@ -1,6 +1,10 @@
 # This tests whether the script-layer can correctly query if a given Broker
 # peering originated from the local node or from another node that peered with it.
 #
+# Can't use this test for -O gen-C++ because of multiple simultaneous
+# Zeek runs.
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
+#
 # @TEST-GROUP: broker
 # @TEST-PORT: BROKER_PORT
 #
diff --git a/testing/btest/broker/publish-errors.zeek b/testing/btest/broker/publish-errors.zeek
index 6f771389db..9adbd81ff1 100644
--- a/testing/btest/broker/publish-errors.zeek
+++ b/testing/btest/broker/publish-errors.zeek
@@ -1,5 +1,9 @@
 # @TEST-DOC: Test that calling Broker::publish() with a Cluster::Event instance fails. Regression test for #4571.
 #
+# Can't use this test for -O gen-C++ because of multiple simultaneous
+# Zeek runs.
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
+#
 # @TEST-GROUP: broker
 #
 # @TEST-PORT: BROKER_PORT
diff --git a/testing/btest/broker/remote_event_vector_any.zeek b/testing/btest/broker/remote_event_vector_any.zeek
index c7b67f9287..9917ef12e1 100644
--- a/testing/btest/broker/remote_event_vector_any.zeek
+++ b/testing/btest/broker/remote_event_vector_any.zeek
@@ -1,3 +1,7 @@
+# Can't use this test for -O gen-C++ because of multiple simultaneous
+# Zeek runs.
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
+#
 # @TEST-GROUP: broker
 #
 # @TEST-PORT: BROKER_PORT
diff --git a/testing/btest/broker/remote_id.zeek b/testing/btest/broker/remote_id.zeek
index 26bbca2e2d..862b63c75d 100644
--- a/testing/btest/broker/remote_id.zeek
+++ b/testing/btest/broker/remote_id.zeek
@@ -1,3 +1,7 @@
+# Can't use this test for -O gen-C++ because of multiple simultaneous
+# Zeek runs.
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
+#
 # @TEST-GROUP: broker
 #
 # @TEST-PORT: BROKER_PORT
diff --git a/testing/btest/core/discarder.zeek b/testing/btest/core/discarder.zeek
index 0494b89750..8cbc9ae89a 100644
--- a/testing/btest/core/discarder.zeek
+++ b/testing/btest/core/discarder.zeek
@@ -1,3 +1,6 @@
+# Can't use this test for -O gen-C++ because of multiple differing Zeek runs.
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
+
 # @TEST-EXEC: zeek -b -C -r $TRACES/wikipedia.trace discarder-ip.zeek >output
 # @TEST-EXEC: zeek -b -C -r $TRACES/wikipedia.trace discarder-tcp.zeek >>output
 # @TEST-EXEC: zeek -b -C -r $TRACES/wikipedia.trace discarder-udp.zeek >>output
diff --git a/testing/btest/core/load-prefixes.zeek b/testing/btest/core/load-prefixes.zeek
index d02b422cfc..1e9f43b8ea 100644
--- a/testing/btest/core/load-prefixes.zeek
+++ b/testing/btest/core/load-prefixes.zeek
@@ -1,5 +1,10 @@
 # A test of prefix-based @load'ing
 
+# Can't use this test for -O gen-C++ because none of the scripts has
+# testing/btest in its path when loaded, so don't get recognized for
+# compilation.
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
+
 # @TEST-EXEC: zeek -b base/utils/site base/protocols/http addprefixes >output
 # @TEST-EXEC: btest-diff output
 
diff --git a/testing/btest/coverage/zeek-profiler-file.zeek b/testing/btest/coverage/zeek-profiler-file.zeek
index 10803a0dc7..496ff9673a 100644
--- a/testing/btest/coverage/zeek-profiler-file.zeek
+++ b/testing/btest/coverage/zeek-profiler-file.zeek
@@ -1,4 +1,8 @@
 # @TEST-REQUIRES: test "${ZEEK_ZAM}" != "1"
+# Can't use this test for -O gen-C++ because none of the scripts has
+# testing/btest in its path when loaded, so don't get recognized for
+# compilation.
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
 #
 # @TEST-EXEC: ZEEK_PROFILER_FILE=cov.txt zeek -b -r $TRACES/http/get.trace profiling-test1.zeek
 # @TEST-EXEC: grep profiling-test1.zeek cov.txt > step1.out
diff --git a/testing/btest/language/at-dir.zeek b/testing/btest/language/at-dir.zeek
index 8f88ec7dcb..4e851c773f 100644
--- a/testing/btest/language/at-dir.zeek
+++ b/testing/btest/language/at-dir.zeek
@@ -1,3 +1,7 @@
+# Can't use this test for -O gen-C++ because the additional script doesn't
+# have testing/btest in its path when loaded, so isn't recognized for
+# compilation.
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
 # @TEST-EXEC: zeek -b %INPUT >out
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff out
 # @TEST-EXEC: zeek -b ./pathtest.zeek >out2
diff --git a/testing/btest/scripts/base/files/x509/x509_check_cert_hostname.zeek b/testing/btest/scripts/base/files/x509/x509_check_cert_hostname.zeek
index 6ebaac2fbd..190dc9346f 100644
--- a/testing/btest/scripts/base/files/x509/x509_check_cert_hostname.zeek
+++ b/testing/btest/scripts/base/files/x509/x509_check_cert_hostname.zeek
@@ -1,5 +1,8 @@
 # Test that certificate event caching works as expected.
 
+# Can't use this test for -O gen-C++ because of multiple different Zeek runs.
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
+
 # @TEST-EXEC: zeek -b -r $TRACES/tls/google-duplicate.trace common.zeek google-duplicate.zeek
 # @TEST-EXEC: cat $TRACES/tls/tls-fragmented-handshake.pcap.gz | gunzip | zeek -b -r - common.zeek fragmented.zeek
 # @TEST-EXEC: zeek -b -r $TRACES/rdp/rdp-to-ssl.pcap common.zeek rdp.zeek
diff --git a/testing/btest/scripts/base/frameworks/cluster/custom_pool_exclusivity.zeek b/testing/btest/scripts/base/frameworks/cluster/custom_pool_exclusivity.zeek
index 456f2ea7a2..1cf55b272e 100644
--- a/testing/btest/scripts/base/frameworks/cluster/custom_pool_exclusivity.zeek
+++ b/testing/btest/scripts/base/frameworks/cluster/custom_pool_exclusivity.zeek
@@ -1,3 +1,7 @@
+# Can't use this test for -O gen-C++ because of multiple simultaneous
+# Zeek runs.
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
+#
 # @TEST-PORT: BROKER_MANAGER_PORT
 # @TEST-PORT: BROKER_PROXY1_PORT
 # @TEST-PORT: BROKER_PROXY2_PORT
diff --git a/testing/btest/scripts/base/frameworks/control/id_value.zeek b/testing/btest/scripts/base/frameworks/control/id_value.zeek
index 1910e5d819..c12d137c6a 100644
--- a/testing/btest/scripts/base/frameworks/control/id_value.zeek
+++ b/testing/btest/scripts/base/frameworks/control/id_value.zeek
@@ -1,3 +1,7 @@
+# Can't use this test for -O gen-C++ because of multiple simultaneous
+# Zeek runs.
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
+
 # @TEST-PORT: BROKER_PORT
 #
 # @TEST-EXEC: btest-bg-run controllee  ZEEKPATH=$ZEEKPATH:.. zeek -b %INPUT only-for-controllee frameworks/control/controllee Broker::default_port=$BROKER_PORT
diff --git a/testing/btest/scripts/base/frameworks/netcontrol/acld-hook.zeek b/testing/btest/scripts/base/frameworks/netcontrol/acld-hook.zeek
index c559059c89..f64d368feb 100644
--- a/testing/btest/scripts/base/frameworks/netcontrol/acld-hook.zeek
+++ b/testing/btest/scripts/base/frameworks/netcontrol/acld-hook.zeek
@@ -1,3 +1,7 @@
+# Can't use this test for -O gen-C++ because of multiple simultaneous
+# Zeek runs.
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
+#
 # @TEST-PORT: BROKER_PORT
 # @TEST-EXEC: btest-bg-run recv "zeek -b ../recv.zeek >recv.out"
 # @TEST-EXEC: btest-bg-run send "zeek -b -r $TRACES/tls/ecdhe.pcap --pseudo-realtime ../send.zeek >send.out"
diff --git a/testing/btest/scripts/base/frameworks/netcontrol/acld.zeek b/testing/btest/scripts/base/frameworks/netcontrol/acld.zeek
index 03d0316010..8cfa0df8e0 100644
--- a/testing/btest/scripts/base/frameworks/netcontrol/acld.zeek
+++ b/testing/btest/scripts/base/frameworks/netcontrol/acld.zeek
@@ -1,3 +1,7 @@
+# Can't use this test for -O gen-C++ because of multiple simultaneous
+# Zeek runs.
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
+#
 # @TEST-PORT: BROKER_PORT
 # @TEST-EXEC: btest-bg-run recv "zeek -b ../recv.zeek >recv.out"
 # @TEST-EXEC: btest-bg-run send "zeek -b -r $TRACES/tls/ecdhe.pcap --pseudo-realtime ../send.zeek >send.out"
diff --git a/testing/btest/scripts/base/frameworks/netcontrol/broker.zeek b/testing/btest/scripts/base/frameworks/netcontrol/broker.zeek
index 3bb95a8a4c..ee980f68d0 100644
--- a/testing/btest/scripts/base/frameworks/netcontrol/broker.zeek
+++ b/testing/btest/scripts/base/frameworks/netcontrol/broker.zeek
@@ -1,3 +1,7 @@
+# Can't use this test for -O gen-C++ because of multiple simultaneous
+# Zeek runs.
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
+#
 # @TEST-PORT: BROKER_PORT
 # @TEST-EXEC: btest-bg-run recv "zeek -b ../recv.zeek >recv.out"
 # @TEST-EXEC: btest-bg-run send "zeek -b -r $TRACES/smtp.trace --pseudo-realtime ../send.zeek >send.out"
diff --git a/testing/btest/scripts/base/frameworks/openflow/broker-basic.zeek b/testing/btest/scripts/base/frameworks/openflow/broker-basic.zeek
index 7252c23db5..1a8dc95b9c 100644
--- a/testing/btest/scripts/base/frameworks/openflow/broker-basic.zeek
+++ b/testing/btest/scripts/base/frameworks/openflow/broker-basic.zeek
@@ -1,3 +1,7 @@
+# Can't use this test for -O gen-C++ because of multiple simultaneous
+# Zeek runs.
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
+#
 # @TEST-PORT: BROKER_PORT
 # @TEST-EXEC: btest-bg-run recv "zeek -b ../recv.zeek >recv.out"
 # @TEST-EXEC: btest-bg-run send "zeek -b -r $TRACES/smtp.trace --pseudo-realtime ../send.zeek >send.out"