Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use libstdc++ in ASAN #6753

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
+3 −21
Open

Use libstdc++ in ASAN #6753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
451d644
Remove alloc_dealloc_mismatch option and pass-through
eddyashton Jan 13, 2025
e4f59ba
Change std lib in ASAN build
eddyashton Jan 13, 2025
df6df24
Format
eddyashton Jan 13, 2025
a975fe1
Merge branch 'main' into asan_libstdcxxx
achamayou Jan 13, 2025
3b69c98
Merge branch 'main' into asan_libstdcxxx
achamayou Jan 14, 2025
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
2 changes: 1 addition & 1 deletion .azure-pipelines-templates/daily-matrix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ parameters:
cmake_args: "-DCMAKE_BUILD_TYPE=Debug"
cmake_env: ""
ASAN:
cmake_args: "-DSAN=ON"
cmake_args: "-DSAN=ON -DUSE_LIBCXX=OFF"
cmake_env: ""
TSAN:
cmake_args: "-DTSAN=ON -DWORKER_THREADS=2"
Expand Down
7 changes: 0 additions & 7 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -921,13 +921,6 @@ if(BUILD_TESTS)
PROPERTY LABELS unit_test
)

# https://github.com/microsoft/CCF/issues/5198
set_property(
TEST csr_test
APPEND
PROPERTY ENVIRONMENT "ASAN_OPTIONS=alloc_dealloc_mismatch=0"
)

add_test(NAME versionifier_test
COMMAND ${PYTHON}
${CMAKE_SOURCE_DIR}/python/src/ccf/_versionifier.py
Expand Down
7 changes: 0 additions & 7 deletions cmake/common.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,6 @@ function(add_unit_test name)
"TSAN_OPTIONS=suppressions=${CCF_DIR}/tsan_env_suppressions"
)

# https://github.com/microsoft/CCF/issues/5198
set_property(
TEST ${name}
APPEND
PROPERTY ENVIRONMENT "ASAN_OPTIONS=alloc_dealloc_mismatch=0"
)

endfunction()

# Test binary wrapper
Expand Down
3 changes: 1 addition & 2 deletions tests/e2e_operations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,6 @@ def run_config_timeout_check(args):
env = {}
if args.enclave_platform == "snp":
env = snp.get_aci_env()
env["ASAN_OPTIONS"] = "alloc_dealloc_mismatch=0"

proc = subprocess.Popen(
[
Expand Down Expand Up @@ -466,7 +465,7 @@ def run_configuration_file_checks(args):
for config in config_files_to_check:
cmd = [bin_path, f"--config={config}", "--check"]
rc = infra.proc.ccall(
*cmd, env={"ASAN_OPTIONS": "alloc_dealloc_mismatch=0"}
*cmd,
).returncode
assert rc == 0, f"Failed to check configuration: {rc}"
LOG.success(f"Successfully check sample configuration file {config}")
Expand Down
5 changes: 1 addition & 4 deletions tests/infra/remote.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,10 +361,7 @@ def __init__(
if ubsan_opts:
env["UBSAN_OPTIONS"] += ":" + ubsan_opts
env["TSAN_OPTIONS"] = os.environ.get("TSAN_OPTIONS", "")
# https://github.com/microsoft/CCF/issues/5198
env["ASAN_OPTIONS"] = os.environ.get(
"ASAN_OPTIONS", "alloc_dealloc_mismatch=0"
)
env["ASAN_OPTIONS"] = os.environ.get("ASAN_OPTIONS", "")
elif enclave_platform == "snp":
env = snp.get_aci_env()
snp_security_context_directory_envvar = (
Expand Down
Loading