[Lldb-commits] [lldb] [lldb] Add support for the darwin-mte-launcher to lldb-dotest (PR #186319)

[via lldb-commits]

llvmbot wrote:


<!--LLVM PR SUMMARY COMMENT-->

@llvm/pr-subscribers-lldb

Author: Jonas Devlieghere (JDevlieghere)

<details>
<summary>Changes</summary>

Add support for the `darwin-mte-launcher` to `lldb-dotest` when LLDB is configured to run the tests under MTE.

---
Full diff: https://github.com/llvm/llvm-project/pull/186319.diff


2 Files Affected:

- (modified) lldb/utils/lldb-dotest/CMakeLists.txt (+5) 
- (modified) lldb/utils/lldb-dotest/lldb-dotest.in (+3) 


``````````diff
diff --git a/lldb/utils/lldb-dotest/CMakeLists.txt b/lldb/utils/lldb-dotest/CMakeLists.txt
index f3f75015637f4..50d0afadf25e6 100644
--- a/lldb/utils/lldb-dotest/CMakeLists.txt
+++ b/lldb/utils/lldb-dotest/CMakeLists.txt
@@ -7,6 +7,10 @@ get_property(LLDB_TEST_USER_ARGS GLOBAL PROPERTY LLDB_TEST_USER_ARGS_PROPERTY)
 get_property(LLDB_TEST_COMMON_ARGS GLOBAL PROPERTY LLDB_TEST_COMMON_ARGS_PROPERTY)
 set(LLDB_LIBS_DIR "${LLVM_LIBRARY_OUTPUT_INTDIR}")
 
+if(TARGET darwin-mte-launcher)
+  set(LLDB_LAUNCHER ${LLVM_RUNTIME_OUTPUT_INTDIR}/darwin-mte-launcher${CMAKE_EXECUTABLE_SUFFIX})
+endif()
+
 llvm_canonicalize_cmake_booleans(
   LLDB_BUILD_INTEL_PT
   LLDB_HAS_LIBCXX
@@ -45,6 +49,7 @@ set(vars
   LIBCXX_LIBRARY_DIR
   LIBCXX_GENERATED_INCLUDE_DIR
   LIBCXX_GENERATED_INCLUDE_TARGET_DIR
+  LLDB_LAUNCHER
   )
 
 llvm_canonicalize_cmake_booleans(LLDB_HAS_LIBCXX)
diff --git a/lldb/utils/lldb-dotest/lldb-dotest.in b/lldb/utils/lldb-dotest/lldb-dotest.in
index c959c389f8a85..6657b6f74dd00 100755
--- a/lldb/utils/lldb-dotest/lldb-dotest.in
+++ b/lldb/utils/lldb-dotest/lldb-dotest.in
@@ -17,6 +17,7 @@ lldb_framework_dir = "@LLDB_FRAMEWORK_DIR_CONFIGURED@"
 lldb_libs_dir = "@LLDB_LIBS_DIR_CONFIGURED@"
 llvm_tools_dir = "@LLVM_TOOLS_DIR_CONFIGURED@"
 lldb_obj_root = "@LLDB_BINARY_DIR@"
+lldb_launcher = "@LLDB_LAUNCHER_CONFIGURED@"
 has_libcxx = @LLDB_HAS_LIBCXX@
 libcxx_libs_dir = "@LIBCXX_LIBRARY_DIR@"
 libcxx_include_dir = "@LIBCXX_GENERATED_INCLUDE_DIR@"
@@ -55,6 +56,8 @@ if __name__ == '__main__':
     cmd.extend(['--lldb-obj-root', lldb_obj_root])
     cmd.extend(['--cmake-build-type', cmake_build_type])
     cmd.extend(wrapper_args)
+    if lldb_launcher:
+        cmd = [lldb_launcher] + cmd
     # Invoke dotest.py and return exit code.
     print(' '.join(cmd))
     sys.exit(subprocess.call(cmd))

``````````

</details>


https://github.com/llvm/llvm-project/pull/186319