From 55df3c8d1cc4f3f9efa722a70efab886094a0f3d Mon Sep 17 00:00:00 2001
From: Jonathan Stone <jstone@lucasfilm.com>
Date: Mon, 18 Mar 2024 12:33:56 -0700
Subject: [PATCH] Move dynamic analysis tests to MacOS (#1743)

This changelist moves dynamic analysis tests to MacOS in GitHub Actions, allowing them to take advantage of more recent compiler environments and hardware.
---
 .github/workflows/main.yml | 16 ++++++++--------
 CMakeLists.txt             |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e204a3f32f..9bb79a1f3f 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -63,14 +63,6 @@ jobs:
           test_render: ON
           clang_format: ON
 
-        - name: Linux_Clang_DynamicAnalysis
-          os: ubuntu-20.04
-          compiler: clang
-          compiler_version: "10"
-          python: None
-          cmake_config: -DMATERIALX_DYNAMIC_ANALYSIS=ON
-          dynamic_analysis: ON
-
         - name: MacOS_Xcode_13_Python37
           os: macos-12
           compiler: xcode
@@ -91,6 +83,14 @@ jobs:
           python: 3.12
           test_shaders: ON
 
+        - name: MacOS_Xcode_DynamicAnalysis
+          os: macos-14
+          compiler: xcode
+          compiler_version: "15.0"
+          python: None
+          dynamic_analysis: ON
+          cmake_config: -DMATERIALX_DYNAMIC_ANALYSIS=ON
+
         - name: iOS_Xcode_15
           os: macos-14
           compiler: xcode
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e037d3e3b3..e975cf6df9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -244,7 +244,7 @@ else()
         add_link_options(--coverage)
     endif()
     if(MATERIALX_DYNAMIC_ANALYSIS)
-        set(DYNAMIC_ANALYSIS_OPTIONS -fsanitize=address -fsanitize=leak -fsanitize=undefined -fno-sanitize-recover=all)
+        set(DYNAMIC_ANALYSIS_OPTIONS -fsanitize=address -fsanitize=undefined -fno-sanitize-recover=all)
         add_compile_options(${DYNAMIC_ANALYSIS_OPTIONS})
         add_link_options(${DYNAMIC_ANALYSIS_OPTIONS})
     endif()