annotated scripts to skip when testing compilation-to-C++

testing/btest/core/check-unused-event-handlers.test

@@ -1,4 +1,5 @@
 # This test should print a warning that the event handler is never invoked.
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
 # @TEST-REQUIRES: $SCRIPTS/have-spicy  # This test logs uninvoked event handlers, so disable it if Spicy and its plugin is unavailable.
 # @TEST-EXEC: zeek -b %INPUT check_for_unused_event_handlers=T
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-sort-and-remove-abspath btest-diff .stderr

testing/btest/core/pcap/input-error.zeek

@@ -1,3 +1,4 @@
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
 # @TEST-EXEC-FAIL: zeek -b -i NO_SUCH_INTERFACE 2>&1  >>output 2>&1
 # @TEST-EXEC: cat output | sed 's/(.*)//g' >output2
 # @TEST-EXEC-FAIL: zeek -b -r NO_SUCH_TRACE 2>&1 >>output2 2>&1

testing/btest/core/scalar-vector.zeek

@@ -1,6 +1,7 @@
-# Skip this test when using ZAM, as it will generate a hard error in addition
+# Skip this test when using script optimization, as that generate hard
-# to the warning.
+# errors in addition to warnings.
 # @TEST-REQUIRES: test "${ZEEK_ZAM}" != "1"
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
 #
 # @TEST-EXEC: zeek -b %INPUT > out 2>&1
 # @TEST-EXEC: TEST_DIFF_CANONIFIER="$SCRIPTS/diff-remove-abspath" btest-diff out

testing/btest/language/at-if-event.zeek

@@ -1,3 +1,4 @@
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
 # @TEST-EXEC: zeek -b %INPUT >out
 # @TEST-EXEC: btest-diff out
 # @TEST-EXEC: btest-diff .stderr

testing/btest/language/at-if.zeek

@@ -1,3 +1,4 @@
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
 # @TEST-EXEC: zeek -b %INPUT >out
 # @TEST-EXEC: btest-diff out
 # @TEST-EXEC: btest-diff .stderr

testing/btest/language/incr-vec-expr.test

@@ -1,3 +1,4 @@
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
 # @TEST-EXEC: zeek -b %INPUT >out
 # @TEST-EXEC: btest-diff out
 

testing/btest/language/uninitialized-local2.zeek

@@ -1,4 +1,5 @@
-# For ZAM, this test generates a hard error rather than a warning.
+# For script optimization this test generates hard errors rather than warnings.
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
 # @TEST-REQUIRES: test "${ZEEK_ZAM}" != "1"
 #
 # @TEST-EXEC: zeek -b %INPUT >out 2>err

testing/btest/language/vector-deprecated.zeek

@@ -1,3 +1,4 @@
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
 # @TEST-EXEC: zeek -b %INPUT >out
 # @TEST-EXEC: btest-diff out
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff .stderr

testing/btest/language/vector-in-operator.zeek

@@ -1,3 +1,4 @@
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
 # @TEST-EXEC: zeek -b %INPUT >out
 # @TEST-EXEC: btest-diff out
 

testing/btest/language/when-unitialized-rhs.zeek

@@ -1,3 +1,6 @@
+# C++-compiled scripts don't check for missing functions - not clear it's
+# worth fixing that.
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
 # @TEST-EXEC: zeek -b -r $TRACES/wikipedia.trace %INPUT >out 2>&1
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff out
 

testing/btest/opt/opt-files.zeek

@@ -1,3 +1,4 @@
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
 # @TEST-EXEC: zeek -b -O ZAM --optimize-files='opt-files' %INPUT >output
 # @TEST-EXEC: btest-diff output
 

testing/btest/opt/opt-files2.zeek

@@ -1,3 +1,4 @@
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
 # @TEST-EXEC: zeek -b -O ZAM --optimize-files='base/utils' %INPUT >output
 # @TEST-EXEC: btest-diff output
 

testing/btest/opt/opt-files3.zeek

@@ -1,3 +1,4 @@
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
 # @TEST-EXEC: zeek -b -O ZAM --optimize-files='base/utils' --optimize-files='opt-files3' %INPUT >output
 # @TEST-EXEC: btest-diff output
 

testing/btest/opt/opt-func.zeek

@@ -1,3 +1,4 @@
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
 # @TEST-EXEC: zeek -b -O ZAM --optimize-func='my_test' %INPUT >output
 # @TEST-EXEC: btest-diff output
 

testing/btest/opt/opt-func2.zeek

@@ -1,3 +1,4 @@
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
 # @TEST-EXEC: zeek -b -O ZAM --optimize-func='another_test' %INPUT >output
 # @TEST-EXEC: btest-diff output
 

testing/btest/opt/opt-func3.zeek

@@ -1,3 +1,4 @@
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
 # @TEST-EXEC: zeek -b -O ZAM --optimize-func='my_test' --optimize-func='another_test' %INPUT >output
 # @TEST-EXEC: btest-diff output
 

testing/btest/opt/pure-inlining.zeek

@@ -1,3 +1,4 @@
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
 # @TEST-EXEC: zeek -b -O inline %INPUT >output
 # @TEST-EXEC: btest-diff output
 

testing/btest/plugins/packet-protocol.zeek

@@ -1,3 +1,4 @@
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
 # @TEST-EXEC: zeek -r $TRACES/raw_layer.pcap -e "@load policy/misc/unknown-protocols"
 # @TEST-EXEC: cat conn.log > output_orig
 # @TEST-EXEC: cat unknown_protocols.log > output_orig

testing/btest/scripts/base/frameworks/telemetry/basic.zeek

@@ -1,4 +1,7 @@
 # @TEST-DOC: Using and listing of counters and gauges using the telemetry module.
+# Note compilable to C++ due to globals being initialized to a record that
+# has an opaque type as a field.
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
 # @TEST-EXEC: zcat <$TRACES/echo-connections.pcap.gz | zeek -b -Cr - %INPUT > out
 # @TEST-EXEC: btest-diff out
 # @TEST-EXEC-FAIL: test -f reporter.log

testing/btest/scripts/base/frameworks/telemetry/cluster.zeek

@@ -1,4 +1,7 @@
 # @TEST-DOC: Query the Prometheus endpoint on 9911 and smoke check that zeek_version_info{...} is contained in the response for all cluster nodes.
+# Note compilable to C++ due to globals being initialized to a record that
+# has an opaque type as a field.
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
 #
 # @TEST-PORT: BROKER_PORT1
 # @TEST-PORT: BROKER_PORT2

testing/btest/scripts/base/frameworks/telemetry/conn-duration-histogram.zeek

@@ -1,3 +1,6 @@
+# Note compilable to C++ due to globals being initialized to a record that
+# has an opaque type as a field.
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
 # @TEST-EXEC: zcat <$TRACES/echo-connections.pcap.gz | zeek -b -Cr - %INPUT > out
 # @TEST-EXEC: btest-diff out
 # @TEST-EXEC-FAIL: test -f reporter.log

testing/btest/scripts/base/frameworks/telemetry/internal-metrics.zeek

@@ -1,4 +1,7 @@
 # @TEST-DOC: Query some internal broker/caf related metrics as they use the int64_t versions, too.
+# Note compilable to C++ due to globals being initialized to a record that
+# has an opaque type as a field.
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
 # @TEST-EXEC: zcat <$TRACES/echo-connections.pcap.gz | zeek -b -Cr - %INPUT > out
 # @TEST-EXEC: btest-diff out
 # @TEST-EXEC-FAIL: test -f reporter.log

testing/btest/supervisor/config-bare-mode.zeek

@@ -3,6 +3,7 @@
 # string depending on mode, and exits. We verify the resulting outputs.
 
 # @TEST-PORT: BROKER_PORT
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
 # @TEST-EXEC: btest-bg-run zeek zeek -j -b %INPUT
 # @TEST-EXEC: btest-bg-wait 30
 # @TEST-EXEC: btest-diff zeek/inherit/node.out