clang-tool-chain 1.1.2__py3-none-any.whl → 1.1.3__py3-none-any.whl

clang_tool_chain/__version__.py

@@ -1,3 +1,3 @@
 """Version information for clang-tool-chain."""
 
-__version__ = "1.1.2"
+__version__ = "1.1.3"

clang_tool_chain/execution/sanitizer_env.py

@@ -160,9 +160,10 @@ def prepare_sanitizer_environment(
         compiler_flags: List of compiler flags used to build the executable.
             Used to detect which sanitizers are enabled. If None, no options
             are injected (safe default).
-        suppression_file: Optional path to custom LSan suppression file.
-            If None, uses built-in platform-specific suppressions.
-            Set to empty string "" to disable built-in suppressions.
+        suppression_file: Optional path to additional custom LSan suppression file.
+            If provided, this file is merged with built-in platform-specific
+            suppressions (built-in applied first, then custom).
+            Set to empty string "" to disable built-in suppressions entirely.
 
     Returns:
         Environment dictionary with sanitizer options injected as appropriate.
@@ -184,7 +185,7 @@ def prepare_sanitizer_environment(
         ...     compiler_flags=["-fsanitize=address"],
         ...     suppression_file="/path/to/custom.txt"
         ... )
-        >>> # Uses custom suppression file instead of built-in
+        >>> # Uses BOTH built-in AND custom suppression files (merged)
     """
     env = base_env.copy() if base_env is not None else os.environ.copy()
 
@@ -225,22 +226,33 @@ def prepare_sanitizer_environment(
 
     # Add platform-specific LSan suppressions if LSAN is enabled
     if lsan_enabled:
-        # Use built-in suppression file if no custom file specified
-        if suppression_file is None:
-            suppression_file = _get_builtin_suppression_file()
+        # Check if user explicitly disabled built-in suppressions with ""
+        disable_builtin = suppression_file == ""
 
-        # Apply suppression file if it exists (unless explicitly disabled with "")
-        if suppression_file and suppression_file != "" and Path(suppression_file).exists():
+        # Helper to append suppression file to LSAN_OPTIONS
+        def _append_suppression(file_path: Path) -> None:
             current_lsan = env.get("LSAN_OPTIONS", "")
-            suppression_opt = f"suppressions={Path(suppression_file).absolute()}"
+            suppression_opt = f"suppressions={file_path.absolute()}"
 
             if current_lsan:
-                # Append to existing options
                 env["LSAN_OPTIONS"] = f"{current_lsan}:{suppression_opt}"
             else:
-                # Set new options
                 env["LSAN_OPTIONS"] = suppression_opt
 
-            logger.info(f"Injecting LSan suppression file: {suppression_file}")
+            logger.info(f"Injecting LSan suppression file: {file_path}")
+
+        # First, apply built-in platform-specific suppressions (unless disabled)
+        if not disable_builtin:
+            builtin_file = _get_builtin_suppression_file()
+            if builtin_file and builtin_file.exists():
+                _append_suppression(builtin_file)
+
+        # Then, also apply custom suppression file if provided (merge behavior)
+        if suppression_file and suppression_file != "":
+            custom_path = Path(suppression_file)
+            if custom_path.exists():
+                _append_suppression(custom_path)
+            else:
+                logger.warning(f"Custom suppression file not found: {suppression_file}")
 
     return env

{clang_tool_chain-1.1.2.dist-info → clang_tool_chain-1.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clang-tool-chain
-Version: 1.1.2
+Version: 1.1.3
 Summary: Clang Tool Chain - C/C++ compilation toolchain utilities
 Project-URL: Homepage, https://github.com/zackees/clang-tool-chain
 Project-URL: Repository, https://github.com/zackees/clang-tool-chain

{clang_tool_chain-1.1.2.dist-info → clang_tool_chain-1.1.3.dist-info}/RECORD

@@ -1,5 +1,5 @@
 clang_tool_chain/__init__.py,sha256=u-qgOuQxh5W2g7n8BgUtBnUWsK66rM4N6LJXY9PiEx0,880
-clang_tool_chain/__version__.py,sha256=QdDf2Y_Q6wfrydeJ6-C_vCqCore3Rs1Q1qnCfaTFRNQ,71
+clang_tool_chain/__version__.py,sha256=9aF3qsv8HoxAYFRckzQBjJmtctXtRBzyFxsX7lsktLc,71
 clang_tool_chain/archive.py,sha256=t3reh7cm5XP2rhTqfRIDAQZv5XQq7SsstyiROYg8wFA,27697
 clang_tool_chain/archive_cache.py,sha256=5ZmlwXIJZDcrDFkTbdgBQYN9sulGn0WyI6qwWqC4HEU,6806
 clang_tool_chain/checksums.py,sha256=KFXeAeDz5ZlcZVOxsHDpNDCrm9UDoJ8bMA4PeNhuzdA,9868
@@ -49,7 +49,7 @@ clang_tool_chain/execution/iwyu.py,sha256=bmP0d_PZObA1JfmFYp3qIOKCb7y32AWPm2_ReF
 clang_tool_chain/execution/lldb.py,sha256=VpxkWTPS6PsyskaKTALeziR5Z5NLwarW174Fm1SMX9k,20718
 clang_tool_chain/execution/nodejs_resolver.py,sha256=8QsJWvIfmt5mBDV7n0ypSjsPyXS-eZTizhBli937I-g,11172
 clang_tool_chain/execution/platform_executor.py,sha256=sF4GyW0ujy2EewG8y2Eo1gUWGzss5G5iIkv02w7-2_o,14362
-clang_tool_chain/execution/sanitizer_env.py,sha256=-Gg852-n3YzPhq0D70YCds4BCCqoCjilWnAYRZzrx9k,10084
+clang_tool_chain/execution/sanitizer_env.py,sha256=bLGUATKNnuB8WxWt1eopVgEh6bsZzkmpcpGxYOeRcHk,10642
 clang_tool_chain/installers/__init__.py,sha256=NAV5woPCEDKSbFr1UmfQsrg4Ua5UdghN4q7H3ymvRsg,279
 clang_tool_chain/installers/base.py,sha256=OS78bau9zoYPitmhla7pKsfCPEj-zLY0DkvVzjE31Tw,15437
 clang_tool_chain/installers/clang.py,sha256=rUtheVRF7mq_1YdmQ3XzIybrJqsHbm2Xf0cbhRbH7RQ,16994
@@ -71,8 +71,8 @@ clang_tool_chain/symbolizer/unwind_windows.h,sha256=XTWhJDv13AAMUPAzWCfRN7tO6EbN
 clang_tool_chain/testing/__init__.py,sha256=-sYqOOCuTV_u-MkmExrD4uKdTHG4RmMwR3D1kIG281Q,208
 clang_tool_chain/testing/diagnostic_runner.py,sha256=mnmFUEOQulY3-Ggu6hKVGZwjrKQNmV6kY80PRTUu2qU,5293
 clang_tool_chain/testing/diagnostic_tests.py,sha256=GmtKWrDcddZTpx9_yIKfhRAy6YOde8dj7SksCWVEME4,6019
-clang_tool_chain-1.1.2.dist-info/METADATA,sha256=XvG34S1grw40mal9rG5dGnwlfnrALxatwQMzFwQkIio,60267
-clang_tool_chain-1.1.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-clang_tool_chain-1.1.2.dist-info/entry_points.txt,sha256=N0a0OVPkCFbf6BisRkHj-m2TcZ-f1mqxfXxAHQxfrQg,2800
-clang_tool_chain-1.1.2.dist-info/licenses/LICENSE,sha256=51FO1oc2pZbQNI0v0_THnznnZIF4iFgawG1xnQ58kKo,10997
-clang_tool_chain-1.1.2.dist-info/RECORD,,
+clang_tool_chain-1.1.3.dist-info/METADATA,sha256=enxAhFiBH36eUVqcz_ljHgQDSU9KFV8h23kVYAnAcKk,60267
+clang_tool_chain-1.1.3.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+clang_tool_chain-1.1.3.dist-info/entry_points.txt,sha256=N0a0OVPkCFbf6BisRkHj-m2TcZ-f1mqxfXxAHQxfrQg,2800
+clang_tool_chain-1.1.3.dist-info/licenses/LICENSE,sha256=51FO1oc2pZbQNI0v0_THnznnZIF4iFgawG1xnQ58kKo,10997
+clang_tool_chain-1.1.3.dist-info/RECORD,,