Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions configuration/builders/definitions/connectors/conodbc.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ def generate_bintar_sqs(
upload_packages_to_ci=True,
get_source_from_git=False,
with_asan_ubsan=False,
with_msan=False,
):

source_sq = [
Expand Down Expand Up @@ -88,6 +89,7 @@ def generate_bintar_sqs(
package_platform_suffix=f"{ops}{version}",
jobs=util.Property("jobs"),
with_asan_ubsan=with_asan_ubsan,
with_msan=with_msan,
),
]
+ (
Expand Down Expand Up @@ -292,3 +294,18 @@ def generate_deb_release_sq(ops, version):
windows(jobs=util.Property("jobs"), target_platform="32-bit"),
],
)

MSAN_BUILDER = GenericBuilder(
name="codbc-debian-13-msan-clang-22",
sidecar=SIDECAR,
sequences=generate_bintar_sqs(
build_environment=docker_config(
image="debian13-msan-clang-22",
artifacts_url=f"{os.environ['ARTIFACTS_URL']}/connector-odbc/",
),
with_msan=True,
ops="debian",
version="13",
upload_packages_to_ci=False,
),
)
19 changes: 19 additions & 0 deletions configuration/builders/sequences/connectors/conodbc.py
Original file line number Diff line number Diff line change
Expand Up @@ -673,6 +673,7 @@ def bintar(
bintar_path: str,
source_path: str,
with_asan_ubsan=False,
with_msan=False,
):
sequence = BuildSequence()
env_vars = None
Expand All @@ -682,6 +683,24 @@ def bintar(
CMakeOption(OTHER.PACKAGE_PLATFORM_SUFFIX, package_platform_suffix),
]

if with_msan:
flags.append(CMakeOption(WITH.MSAN, True))
flags.append(
CMakeOption(
CMAKE.EXE_LINKER_FLAGS, "-L${MSAN_LIBDIR} -Wl,-rpath,${MSAN_LIBDIR}"
)
)
flags.append(
CMakeOption(
CMAKE.SHARED_LINKER_FLAGS, "-L${MSAN_LIBDIR} -Wl,-rpath,${MSAN_LIBDIR}"
)
)
flags.append(
CMakeOption(
CMAKE.MODULE_LINKER_FLAGS, "-L${MSAN_LIBDIR} -Wl,-rpath,${MSAN_LIBDIR}"
)
)

if with_asan_ubsan:
sequence.add_step(
InContainer(
Expand Down
1 change: 1 addition & 0 deletions configuration/schedulers/connectors.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
odbc_builders.MACOS_BUILDER.name,
odbc_builders.WINDOWS_64_BUILDER.name,
odbc_builders.WINDOWS_32_BUILDER.name,
odbc_builders.MSAN_BUILDER.name,
],
),
]
Expand Down
1 change: 1 addition & 0 deletions configuration/steps/generators/cmake/options.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ class CMAKE(StrEnum):
INSTALL_PREFIX = "INSTALL_PREFIX"
LIBRARY_PATH = "LIBRARY_PATH"
MODULE_LINKER_FLAGS = "MODULE_LINKER_FLAGS"
SHARED_LINKER_FLAGS = "SHARED_LINKER_FLAGS"

def __str__(self):
return f"CMAKE_{self.value}"
Expand Down
9 changes: 9 additions & 0 deletions master-migration/master.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,15 @@ c["builders"].append(
)
)

# MSAN Connector/ODBC builder
c["builders"].append(
conc_odbc_builders.MSAN_BUILDER.get_config(
workers=CONNECTORS_WORKERS_BY_ARCH.get("amd64", []),
tags=["connector", "odbc", "sanitizer", "msan", "clang"],
jobs=1,
)
)

## ------------------------------------------------------------------- ##
## REPORTERS ##
## ------------------------------------------------------------------- ##
Expand Down