Author: Pavel Labath Date: 2020-02-05T15:51:38-08:00 New Revision: 5f1e45fd6764f9e31de1c9d6d7581645eea0c696
URL: https://github.com/llvm/llvm-project/commit/5f1e45fd6764f9e31de1c9d6d7581645eea0c696 DIFF: https://github.com/llvm/llvm-project/commit/5f1e45fd6764f9e31de1c9d6d7581645eea0c696.diff LOG: [lldb] pass --lldb-libs-dir argument to lldb-dotest This argument was introduced in dcab9736f, but lldb-dotest was not handled. Added: Modified: lldb/utils/lldb-dotest/CMakeLists.txt lldb/utils/lldb-dotest/lldb-dotest.in Removed: ################################################################################ diff --git a/lldb/utils/lldb-dotest/CMakeLists.txt b/lldb/utils/lldb-dotest/CMakeLists.txt index 4fd16f0f90b3..55ba0ba3c824 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 bab3f8baa98d..a1d520349523 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)) _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
