Author: Dave Lee Date: 2025-01-28T13:36:40-08:00 New Revision: e89e7c4685aa673173220eace7a0a8b64dbd2391
URL: https://github.com/llvm/llvm-project/commit/e89e7c4685aa673173220eace7a0a8b64dbd2391 DIFF: https://github.com/llvm/llvm-project/commit/e89e7c4685aa673173220eace7a0a8b64dbd2391.diff LOG: [lldb] Fix lldb-dotest.in to use args determined by CMake (#124811) This change is required as a result of the changes made in D132642 (bb26ebb4d18c1877cc6fd17aa803609abeb95096). Added: Modified: lldb/utils/lldb-dotest/lldb-dotest.in Removed: ################################################################################ diff --git a/lldb/utils/lldb-dotest/lldb-dotest.in b/lldb/utils/lldb-dotest/lldb-dotest.in index f20859e87b1e0b..9688b94d918429 100755 --- a/lldb/utils/lldb-dotest/lldb-dotest.in +++ b/lldb/utils/lldb-dotest/lldb-dotest.in @@ -4,7 +4,8 @@ import subprocess import sys dotest_path = '@LLDB_SOURCE_DIR_CONFIGURED@/test/API/dotest.py' -dotest_args_str = '@LLDB_DOTEST_ARGS_CONFIGURED@' +dotest_common_args_str = '@LLDB_TEST_COMMON_ARGS_CONFIGURED@' +dotest_user_args_str = '@LLDB_TEST_USER_ARGS_CONFIGURED@' arch = '@LLDB_TEST_ARCH@' executable = '@LLDB_TEST_EXECUTABLE_CONFIGURED@' compiler = '@LLDB_TEST_COMPILER_CONFIGURED@' @@ -26,8 +27,10 @@ if __name__ == '__main__': dotest_args = [] # split on an empty string will produce [''] and if you # add that to the command, it will be treated as a directory... - if len(dotest_args_str) > 0: - dotest_args = dotest_args_str.split(';') + if dotest_common_args_str: + dotest_args.extend(dotest_common_args_str.split(';')) + if dotest_user_args_str: + dotest_args.extend(dotest_user_args_str.split(';')) # Build dotest.py command. cmd = [sys.executable, dotest_path] cmd.extend(['--arch', arch]) _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
