aboutsummaryrefslogtreecommitdiff
path: root/lldb/utils
diff options
context:
space:
mode:
authorPavel Labath <labath@google.com>2020-02-05 15:15:01 -0800
committerPavel Labath <labath@google.com>2020-02-05 15:51:38 -0800
commit5f1e45fd6764f9e31de1c9d6d7581645eea0c696 (patch)
tree12b5793afceb0f56473d5f6175d2577dcab79ec5 /lldb/utils
parentf5f70d1c8fbf12249b4b9598f10a10f12d4db029 (diff)
downloadllvm-5f1e45fd6764f9e31de1c9d6d7581645eea0c696.zip
llvm-5f1e45fd6764f9e31de1c9d6d7581645eea0c696.tar.gz
llvm-5f1e45fd6764f9e31de1c9d6d7581645eea0c696.tar.bz2
[lldb] pass --lldb-libs-dir argument to lldb-dotest
This argument was introduced in dcab9736f, but lldb-dotest was not handled.
Diffstat (limited to 'lldb/utils')
-rw-r--r--lldb/utils/lldb-dotest/CMakeLists.txt1
-rwxr-xr-xlldb/utils/lldb-dotest/lldb-dotest.in3
2 files changed, 4 insertions, 0 deletions
diff --git a/lldb/utils/lldb-dotest/CMakeLists.txt b/lldb/utils/lldb-dotest/CMakeLists.txt
index 4fd16f0..55ba0ba 100644
--- a/lldb/utils/lldb-dotest/CMakeLists.txt
+++ b/lldb/utils/lldb-dotest/CMakeLists.txt
@@ -4,6 +4,7 @@ add_dependencies(lldb-dotest lldb-test-deps)
set_target_properties(lldb-dotest PROPERTIES FOLDER "lldb utils")
get_property(LLDB_DOTEST_ARGS GLOBAL PROPERTY LLDB_DOTEST_ARGS_PROPERTY)
+set(LLDB_LIBS_DIR "${LLVM_LIBRARY_OUTPUT_INTDIR}")
# Generate lldb-dotest Python driver script for each build mode.
if(LLDB_BUILT_STANDALONE)
diff --git a/lldb/utils/lldb-dotest/lldb-dotest.in b/lldb/utils/lldb-dotest/lldb-dotest.in
index bab3f8b..a1d5203 100755
--- a/lldb/utils/lldb-dotest/lldb-dotest.in
+++ b/lldb/utils/lldb-dotest/lldb-dotest.in
@@ -10,6 +10,8 @@ executable = '@LLDB_TEST_EXECUTABLE@'
compiler = '@LLDB_TEST_COMPILER@'
dsymutil = '@LLDB_TEST_DSYMUTIL@'
filecheck = '@LLDB_TEST_FILECHECK@'
+lldb_libs_dir = "@LLDB_LIBS_DIR@"
+
if __name__ == '__main__':
wrapper_args = sys.argv[1:]
@@ -23,6 +25,7 @@ if __name__ == '__main__':
cmd.extend(['--compiler', compiler])
cmd.extend(['--dsymutil', dsymutil])
cmd.extend(['--filecheck', filecheck])
+ cmd.extend(['--lldb-libs-dir', lldb_libs_dir])
cmd.extend(wrapper_args)
# Invoke dotest.py and return exit code.
print(' '.join(cmd))