Skip to content

Commit 0ed48a2

Browse files
JDevliegheregithub-actions[bot]
authored andcommitted
Automerge: [lldb] Fix libcxx configuration in dotest.py (#151258)
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.
2 parents b3e942f + db322be commit 0ed48a2

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

lldb/packages/Python/lldbsuite/test/dotest.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -294,9 +294,11 @@ def parseOptionsAndInitTestdirs():
294294
"Custom libc++ requires both --libcxx-include-dir and --libcxx-library-dir"
295295
)
296296
sys.exit(-1)
297-
configuration.libcxx_include_dir = args.libcxx_include_dir
298-
configuration.libcxx_include_target_dir = args.libcxx_include_target_dir
299-
configuration.libcxx_library_dir = args.libcxx_library_dir
297+
else:
298+
configuration.libcxx_include_dir = args.libcxx_include_dir
299+
configuration.libcxx_include_target_dir = args.libcxx_include_target_dir
300+
configuration.libcxx_library_dir = args.libcxx_library_dir
301+
300302
configuration.cmake_build_type = args.cmake_build_type.lower()
301303

302304
if args.channels:

0 commit comments

Comments
 (0)