diff options
author | Walter Erquinigo <wallace@fb.com> | 2020-04-03 19:42:58 -0700 |
---|---|---|
committer | Walter Erquinigo <wallace@fb.com> | 2020-04-15 17:52:36 -0700 |
commit | acfee72a053575f52a0922d2182d76eb42edff76 (patch) | |
tree | c3bf8e833f4050ffc9c380bf2a3950fc2ec9499a /lldb/utils | |
parent | 4f37450b2cb2dfc3c201a1b87f25062560ef3327 (diff) | |
download | llvm-acfee72a053575f52a0922d2182d76eb42edff76.zip llvm-acfee72a053575f52a0922d2182d76eb42edff76.tar.gz llvm-acfee72a053575f52a0922d2182d76eb42edff76.tar.bz2 |
Another attempt of D77452 - da0e91fee614e8686f48db28e6507c8abe061fc2
[intel-pt] Improve the way the test determines whether to run
- Now I'm creating a default value for the new test parameter
- I fixed a small mistake in the skipping logic of the test
... I forgot to clear the cmake cache when testing my diff
Diffstat (limited to 'lldb/utils')
-rw-r--r-- | lldb/utils/lldb-dotest/CMakeLists.txt | 4 | ||||
-rwxr-xr-x | lldb/utils/lldb-dotest/lldb-dotest.in | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/lldb/utils/lldb-dotest/CMakeLists.txt b/lldb/utils/lldb-dotest/CMakeLists.txt index 7359613..0278c37 100644 --- a/lldb/utils/lldb-dotest/CMakeLists.txt +++ b/lldb/utils/lldb-dotest/CMakeLists.txt @@ -6,6 +6,10 @@ 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}") +llvm_canonicalize_cmake_booleans( + LLDB_BUILD_INTEL_PT +) + # Generate lldb-dotest Python driver script for each build mode. if(LLDB_BUILT_STANDALONE) set(config_types ".") diff --git a/lldb/utils/lldb-dotest/lldb-dotest.in b/lldb/utils/lldb-dotest/lldb-dotest.in index edddaf4..36d5fd3 100755 --- a/lldb/utils/lldb-dotest/lldb-dotest.in +++ b/lldb/utils/lldb-dotest/lldb-dotest.in @@ -11,6 +11,7 @@ compiler = '@LLDB_TEST_COMPILER_CONFIGURED@' dsymutil = '@LLDB_TEST_DSYMUTIL_CONFIGURED@' filecheck = '@LLDB_TEST_FILECHECK_CONFIGURED@' lldb_libs_dir = "@LLDB_LIBS_DIR_CONFIGURED@" +lldb_build_intel_pt = "@LLDB_BUILD_INTEL_PT@" if __name__ == '__main__': wrapper_args = sys.argv[1:] @@ -25,6 +26,8 @@ if __name__ == '__main__': cmd.extend(['--dsymutil', dsymutil]) cmd.extend(['--filecheck', filecheck]) cmd.extend(['--lldb-libs-dir', lldb_libs_dir]) + if lldb_build_intel_pt == "1": + cmd.extend(['--enable-plugin', 'intel-pt']) cmd.extend(wrapper_args) # Invoke dotest.py and return exit code. print(' '.join(cmd)) |