Skip to content

Commit

Permalink
Merge pull request #23531 from dotnwat/ducktape-ubsan-suppressions
Browse files Browse the repository at this point in the history
test: apply ubsan suppressions to all redpanda invocations
  • Loading branch information
dotnwat authored Sep 27, 2024
2 parents 6bbae76 + acefacd commit 2948e75
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions tests/rptest/services/redpanda.py
Original file line number Diff line number Diff line change
Expand Up @@ -2553,6 +2553,10 @@ def __init__(self,

self._expect_max_controller_records = 1000

def redpanda_env_preamble(self):
# Pass environment variables via FOO=BAR shell expressions
return " ".join([f"{k}={v}" for (k, v) in self._environment.items()])

def set_seed_servers(self, node_list):
assert len(node_list) > 0
self._seed_servers = node_list
Expand Down Expand Up @@ -2961,9 +2965,7 @@ def start_redpanda(self, node, extra_cli: list[str] = []):
dict(LLVM_PROFILE_FILE=
f"\"{RedpandaService.COVERAGE_PROFRAW_CAPTURE}\""))

# Pass environment variables via FOO=BAR shell expressions
env_preamble = " ".join(
[f"{k}={v}" for (k, v) in self._environment.items()])
env_preamble = self.redpanda_env_preamble()

cmd = (
f"{preamble} {env_preamble} nohup {self.find_binary('redpanda')}"
Expand Down Expand Up @@ -3879,7 +3881,8 @@ def get_version(self, node):
"""
Returns the redpanda binary version as a string.
"""
version_cmd = f"{self.find_binary('redpanda')} --version"
env_preamble = self.redpanda_env_preamble()
version_cmd = f"{env_preamble} {self.find_binary('redpanda')} --version"
VERSION_LINE_RE = re.compile(".*(v\\d+\\.\\d+\\.\\d+).*")
# NOTE: not all versions of Redpanda support the --version field, even
# though they print out the version.
Expand Down

0 comments on commit 2948e75

Please sign in to comment.