Skip to content

Commit 4518ebe

Browse files
committed
[lldb] Fix lldb-dotest.in to use args determined by CMake (llvm#124811)
This change is required as a result of the changes made in D132642 (bb26ebb). (cherry picked from commit e89e7c4)
1 parent 30e548b commit 4518ebe

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

lldb/utils/lldb-dotest/lldb-dotest.in

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ import subprocess
44
import sys
55

66
dotest_path = '@LLDB_SOURCE_DIR_CONFIGURED@/test/API/dotest.py'
7-
dotest_args_str = '@LLDB_DOTEST_ARGS_CONFIGURED@'
7+
dotest_common_args_str = '@LLDB_TEST_COMMON_ARGS_CONFIGURED@'
8+
dotest_user_args_str = '@LLDB_TEST_USER_ARGS_CONFIGURED@'
89
arch = '@LLDB_TEST_ARCH@'
910
executable = '@LLDB_TEST_EXECUTABLE_CONFIGURED@'
1011
compiler = '@LLDB_TEST_COMPILER_CONFIGURED@'
@@ -28,8 +29,10 @@ if __name__ == '__main__':
2829
dotest_args = []
2930
# split on an empty string will produce [''] and if you
3031
# add that to the command, it will be treated as a directory...
31-
if len(dotest_args_str) > 0:
32-
dotest_args = dotest_args_str.split(';')
32+
if dotest_common_args_str:
33+
dotest_args.extend(dotest_common_args_str.split(';'))
34+
if dotest_user_args_str:
35+
dotest_args.extend(dotest_user_args_str.split(';'))
3336
# Build dotest.py command.
3437
cmd = [sys.executable, dotest_path]
3538
cmd.extend(['--arch', arch])

0 commit comments

Comments
 (0)