Merge remote-tracking branch 'origin/topic/vern/bit-shift-fixes'

* origin/topic/vern/bit-shift-fixes:
  btest portability fix address review comment about shifting corner-case
  canonicalize filenames for new vector deprecation btest
  updates for gen-C++ maintenance, including skipping some inappropriate tests
  fix for profiling "when" statements
  gen-C++ support for vector bit-shift operations
  corrected wording in some btest comments
  make gen-C++ maintenance scripts directly executable
  ZAM support for bit-shifting
  don't allow deprecated-style mixing of vectors and scaling for shifting leverage restrictions placed on shifting (RHS is always unsigned) split deprecated vector operations into separate test, with separate ZAM baseline
  ZAM fix for vector "in" operator
  ensure that language tests pay attention to .stderr
  fix vector tests, including checking for errors

testing/btest/scripts/base/protocols/http/multipart-file-limit.zeek

@@ -1,3 +1,7 @@
+# Don't run for C++ scripts because the multiple invocations lead to
+# some runs having complaints that there are no scripts.
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
+
 # @TEST-EXEC: zeek -b -C -r $TRACES/http/multipart.trace base/protocols/http
 # @TEST-EXEC: btest-diff http.log
 # @TEST-EXEC: zeek -b -C -r $TRACES/http/multipart.trace base/protocols/http %INPUT >out-limited

testing/btest/scripts/base/protocols/smb/smb2-create-delete-on-close.zeek

@@ -1,3 +1,6 @@
+# Don't run for C++ scripts because there's no script to compile.
+# @TEST-REQUIRES: test "${ZEEK_USE_CPP}" != "1"
+
 # @TEST-EXEC: zeek -C -r $TRACES/smb/smb2.delete-on-close-perms-delete-existing.pcap policy/protocols/smb/log-cmds
 # @TEST-EXEC: btest-diff smb_files.log
 # @TEST-EXEC: btest-diff smb_cmd.log