From 91985ff52a1317cb2460f0508fdf22db276191d2 Mon Sep 17 00:00:00 2001 From: Jonas Devlieghere Date: Tue, 29 Jul 2025 16:56:13 -0700 Subject: [PATCH] [lldb] Fix libcxx configuration in dotest.py We emit a warning when running the test suite remotely that says the libcxx arguments will be ignored, but because they're set outside the conditional block, we're not actually do this. Fix the logic by moving the configuration in the conditional else-block. --- lldb/packages/Python/lldbsuite/test/dotest.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lldb/packages/Python/lldbsuite/test/dotest.py b/lldb/packages/Python/lldbsuite/test/dotest.py index 90c8e32afa507..24236e779e51d 100644 --- a/lldb/packages/Python/lldbsuite/test/dotest.py +++ b/lldb/packages/Python/lldbsuite/test/dotest.py @@ -294,9 +294,11 @@ def parseOptionsAndInitTestdirs(): "Custom libc++ requires both --libcxx-include-dir and --libcxx-library-dir" ) sys.exit(-1) - configuration.libcxx_include_dir = args.libcxx_include_dir - configuration.libcxx_include_target_dir = args.libcxx_include_target_dir - configuration.libcxx_library_dir = args.libcxx_library_dir + else: + configuration.libcxx_include_dir = args.libcxx_include_dir + configuration.libcxx_include_target_dir = args.libcxx_include_target_dir + configuration.libcxx_library_dir = args.libcxx_library_dir + configuration.cmake_build_type = args.cmake_build_type.lower() if args.channels: