diff --git a/testing/btest/core/check-unused-event-handlers.test b/testing/btest/core/check-unused-event-handlers.test index 2d2fe68e14..b5f9cf4aae 100644 --- a/testing/btest/core/check-unused-event-handlers.test +++ b/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 diff --git a/testing/btest/core/pcap/input-error.zeek b/testing/btest/core/pcap/input-error.zeek index b08ac962e9..37332bbcef 100644 --- a/testing/btest/core/pcap/input-error.zeek +++ b/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 diff --git a/testing/btest/core/scalar-vector.zeek b/testing/btest/core/scalar-vector.zeek index 004ef5eec1..e5bcc44431 100644 --- a/testing/btest/core/scalar-vector.zeek +++ b/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 -# to the warning. +# Skip this test when using script optimization, as that generate hard +# 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 diff --git a/testing/btest/language/at-if-event.zeek b/testing/btest/language/at-if-event.zeek index 5624eb6f91..a9370b34b8 100644 --- a/testing/btest/language/at-if-event.zeek +++ b/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 diff --git a/testing/btest/language/at-if.zeek b/testing/btest/language/at-if.zeek index 4e62051b1c..db6c5df2ed 100644 --- a/testing/btest/language/at-if.zeek +++ b/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 diff --git a/testing/btest/language/incr-vec-expr.test b/testing/btest/language/incr-vec-expr.test index 1bd3e54129..7831f2292b 100644 --- a/testing/btest/language/incr-vec-expr.test +++ b/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 diff --git a/testing/btest/language/uninitialized-local2.zeek b/testing/btest/language/uninitialized-local2.zeek index 4d30dad5c3..be1dcf6e82 100644 --- a/testing/btest/language/uninitialized-local2.zeek +++ b/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 diff --git a/testing/btest/language/vector-deprecated.zeek b/testing/btest/language/vector-deprecated.zeek index ed0d09661c..2e3d87f841 100644 --- a/testing/btest/language/vector-deprecated.zeek +++ b/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 diff --git a/testing/btest/language/vector-in-operator.zeek b/testing/btest/language/vector-in-operator.zeek index ceea232f0e..e8cb455dc9 100644 --- a/testing/btest/language/vector-in-operator.zeek +++ b/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 diff --git a/testing/btest/language/when-unitialized-rhs.zeek b/testing/btest/language/when-unitialized-rhs.zeek index 62464004f2..2e30ae35bb 100644 --- a/testing/btest/language/when-unitialized-rhs.zeek +++ b/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 diff --git a/testing/btest/opt/opt-files.zeek b/testing/btest/opt/opt-files.zeek index c311f6359f..c2413bf59c 100644 --- a/testing/btest/opt/opt-files.zeek +++ b/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 diff --git a/testing/btest/opt/opt-files2.zeek b/testing/btest/opt/opt-files2.zeek index 576680cae9..c2cb5852f9 100644 --- a/testing/btest/opt/opt-files2.zeek +++ b/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 diff --git a/testing/btest/opt/opt-files3.zeek b/testing/btest/opt/opt-files3.zeek index 588c633c8d..647d791f19 100644 --- a/testing/btest/opt/opt-files3.zeek +++ b/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 diff --git a/testing/btest/opt/opt-func.zeek b/testing/btest/opt/opt-func.zeek index e93f72c8ed..01713b0676 100644 --- a/testing/btest/opt/opt-func.zeek +++ b/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 diff --git a/testing/btest/opt/opt-func2.zeek b/testing/btest/opt/opt-func2.zeek index 773d438789..6ec477da0b 100644 --- a/testing/btest/opt/opt-func2.zeek +++ b/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 diff --git a/testing/btest/opt/opt-func3.zeek b/testing/btest/opt/opt-func3.zeek index 13202b4641..4d1f44ce3d 100644 --- a/testing/btest/opt/opt-func3.zeek +++ b/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 diff --git a/testing/btest/opt/pure-inlining.zeek b/testing/btest/opt/pure-inlining.zeek index 993457bd7c..ec1e9b8c74 100644 --- a/testing/btest/opt/pure-inlining.zeek +++ b/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 diff --git a/testing/btest/plugins/packet-protocol.zeek b/testing/btest/plugins/packet-protocol.zeek index ef70f0915b..edf371b85c 100644 --- a/testing/btest/plugins/packet-protocol.zeek +++ b/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 diff --git a/testing/btest/scripts/base/frameworks/telemetry/basic.zeek b/testing/btest/scripts/base/frameworks/telemetry/basic.zeek index 32e85fa30b..fc6e8deabc 100644 --- a/testing/btest/scripts/base/frameworks/telemetry/basic.zeek +++ b/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 diff --git a/testing/btest/scripts/base/frameworks/telemetry/cluster.zeek b/testing/btest/scripts/base/frameworks/telemetry/cluster.zeek index f71fdc1ad1..a5cd54e163 100644 --- a/testing/btest/scripts/base/frameworks/telemetry/cluster.zeek +++ b/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 diff --git a/testing/btest/scripts/base/frameworks/telemetry/conn-duration-histogram.zeek b/testing/btest/scripts/base/frameworks/telemetry/conn-duration-histogram.zeek index 23999206a0..b892f5740c 100644 --- a/testing/btest/scripts/base/frameworks/telemetry/conn-duration-histogram.zeek +++ b/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 diff --git a/testing/btest/scripts/base/frameworks/telemetry/internal-metrics.zeek b/testing/btest/scripts/base/frameworks/telemetry/internal-metrics.zeek index 9d7b549fc9..3df5beee2b 100644 --- a/testing/btest/scripts/base/frameworks/telemetry/internal-metrics.zeek +++ b/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 diff --git a/testing/btest/supervisor/config-bare-mode.zeek b/testing/btest/supervisor/config-bare-mode.zeek index 85fa8900dd..c52dab06f2 100644 --- a/testing/btest/supervisor/config-bare-mode.zeek +++ b/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