[Lldb-commits] [lldb] da0e91f - [intel-pt] Improve the way the test determines whether to run
Walter Erquinigo via lldb-commits
lldb-commits at lists.llvm.org
Wed Apr 15 16:20:29 PDT 2020
Author: Walter Erquinigo
Date: 2020-04-15T16:03:31-07:00
New Revision: da0e91fee614e8686f48db28e6507c8abe061fc2
URL: https://github.com/llvm/llvm-project/commit/da0e91fee614e8686f48db28e6507c8abe061fc2
DIFF: https://github.com/llvm/llvm-project/commit/da0e91fee614e8686f48db28e6507c8abe061fc2.diff
LOG: [intel-pt] Improve the way the test determines whether to run
Summary:
@labath raised a concern on the way I was skipping this test. I think that was
fair and I found a better way.
Now I'm skipping if the CMAKE flag LLDB_BUILD_INTEL_PT is false.
I added an enabled_plugins entry in the dotest configuration, which gets
set by lit or lldb-dotest. The only available plugin right now is
'intel-pt', but I imagine it will be useful in the future for other
kinds of plugins that get determined at configuration time. I didn't
want to add a new argument option --enable-intel-pt or something or the
sort, as it wouldn't be useful for other cases.
Reviewers: labath, clayborg
Subscribers: lldb-commits, labath
Tags: #lldb
Differential Revision: https://reviews.llvm.org/D77452
Added:
Modified:
lldb/packages/Python/lldbsuite/test/configuration.py
lldb/packages/Python/lldbsuite/test/dotest.py
lldb/packages/Python/lldbsuite/test/dotest_args.py
lldb/test/API/lit.cfg.py
lldb/test/API/lit.site.cfg.py.in
lldb/test/API/tools/intel-features/intel-pt/test/TestIntelPTSimpleBinary.py
lldb/test/CMakeLists.txt
lldb/utils/lldb-dotest/CMakeLists.txt
lldb/utils/lldb-dotest/lldb-dotest.in
Removed:
################################################################################
diff --git a/lldb/packages/Python/lldbsuite/test/configuration.py b/lldb/packages/Python/lldbsuite/test/configuration.py
index 9d6943813cb8..ddae780339cb 100644
--- a/lldb/packages/Python/lldbsuite/test/configuration.py
+++ b/lldb/packages/Python/lldbsuite/test/configuration.py
@@ -137,6 +137,9 @@
# LLDB library directory.
lldb_libs_dir = None
+# A plugin whose tests will be enabled, like intel-pt.
+enabled_plugins = []
+
def shouldSkipBecauseOfCategories(test_categories):
if use_categories:
diff --git a/lldb/packages/Python/lldbsuite/test/dotest.py b/lldb/packages/Python/lldbsuite/test/dotest.py
index b5666ecded2e..c4e4b615aca8 100644
--- a/lldb/packages/Python/lldbsuite/test/dotest.py
+++ b/lldb/packages/Python/lldbsuite/test/dotest.py
@@ -467,6 +467,9 @@ def parseOptionsAndInitTestdirs():
if args.lldb_libs_dir:
configuration.lldb_libs_dir = args.lldb_libs_dir
+ if args.enabled_plugins:
+ configuration.enabled_plugins = args.enabled_plugins
+
# Gather all the dirs passed on the command line.
if len(args.args) > 0:
configuration.testdirs = [os.path.realpath(os.path.abspath(x)) for x in args.args]
diff --git a/lldb/packages/Python/lldbsuite/test/dotest_args.py b/lldb/packages/Python/lldbsuite/test/dotest_args.py
index ad9508d70394..410097f816af 100644
--- a/lldb/packages/Python/lldbsuite/test/dotest_args.py
+++ b/lldb/packages/Python/lldbsuite/test/dotest_args.py
@@ -177,6 +177,13 @@ def create_parser():
dest='lldb_libs_dir',
metavar='path',
help='The path to LLDB library directory (containing liblldb)')
+ group.add_argument(
+ '--enable-plugin',
+ dest='enabled_plugins',
+ action='append',
+ type=str,
+ metavar='A plugin whose tests will be enabled',
+ help='A plugin whose tests will be enabled. The only currently supported plugin is intel-pt.')
# Configuration options
group = parser.add_argument_group('Remote platform options')
diff --git a/lldb/test/API/lit.cfg.py b/lldb/test/API/lit.cfg.py
index 835e69e39e32..662da7d7ccd2 100644
--- a/lldb/test/API/lit.cfg.py
+++ b/lldb/test/API/lit.cfg.py
@@ -127,6 +127,10 @@ def find_shlibpath_var():
if config.lldb_libs_dir:
dotest_cmd += ['--lldb-libs-dir', config.lldb_libs_dir]
+if config.enabled_plugins:
+ for plugin in config.enabled_plugins:
+ dotest_cmd += ['--enable-plugin', plugin]
+
# We don't want to force users passing arguments to lit to use `;` as a
# separator. We use Python's simple lexical analyzer to turn the args into a
# list. Pass there arguments last so they can override anything that was
diff --git a/lldb/test/API/lit.site.cfg.py.in b/lldb/test/API/lit.site.cfg.py.in
index 4e9413aac6f8..b50f59f8b4d0 100644
--- a/lldb/test/API/lit.site.cfg.py.in
+++ b/lldb/test/API/lit.site.cfg.py.in
@@ -32,6 +32,11 @@ config.filecheck = '@LLDB_TEST_FILECHECK@'
config.lldb_module_cache = os.path.join("@LLDB_TEST_MODULE_CACHE_LLDB@", "lldb-api")
config.clang_module_cache = os.path.join("@LLDB_TEST_MODULE_CACHE_CLANG@", "lldb-api")
+# Plugins
+lldb_build_intel_pt = '@LLDB_BUILD_INTEL_PT@'
+if lldb_build_intel_pt == '1':
+ config.enabled_plugins = ['intel-pt']
+
# Additional dotest arguments can be passed to lit by providing a
# semicolon-separates list: --param dotest-args="arg;arg".
dotest_lit_args_str = lit_config.params.get('dotest-args', None)
diff --git a/lldb/test/API/tools/intel-features/intel-pt/test/TestIntelPTSimpleBinary.py b/lldb/test/API/tools/intel-features/intel-pt/test/TestIntelPTSimpleBinary.py
index ea7f6a469f8f..91f1ea7724e9 100644
--- a/lldb/test/API/tools/intel-features/intel-pt/test/TestIntelPTSimpleBinary.py
+++ b/lldb/test/API/tools/intel-features/intel-pt/test/TestIntelPTSimpleBinary.py
@@ -7,6 +7,7 @@
from lldbsuite.test.decorators import *
from lldbsuite.test.lldbtest import *
from lldbsuite.test import lldbutil
+from lldbsuite.test import configuration
class TestIntelPTSimpleBinary(TestBase):
@@ -14,22 +15,22 @@ class TestIntelPTSimpleBinary(TestBase):
mydir = TestBase.compute_mydir(__file__)
NO_DEBUG_INFO_TESTCASE = True
+ def setUp(self):
+ TestBase.setUp(self)
+
+ if 'intel-pt' not in configuration.enabled_plugins:
+ self.skipTest("The '" + self.plugin + "' test plugin is not enabled")
+
+ plugin_path = os.path.join(os.environ["LLDB_IMPLIB_DIR"], "liblldbIntelFeatures.so")
+ self.runCmd("plugin load " + plugin_path)
+
@skipIf(oslist=no_match(['linux']))
@skipIf(archs=no_match(['i386', 'x86_64']))
@skipIfRemote
def test_basic_flow(self):
"""Test collection, decoding, and dumping instructions"""
- if os.environ.get('TEST_INTEL_PT') != '1':
- self.skipTest("The environment variable TEST_INTEL_PT=1 is needed to run this test.")
-
- lldb_exec_dir = os.environ["LLDB_IMPLIB_DIR"]
- lldb_lib_dir = os.path.join(lldb_exec_dir, os.pardir, "lib")
- plugin_file = os.path.join(lldb_lib_dir, "liblldbIntelFeatures.so")
self.build()
-
- self.runCmd("plugin load " + plugin_file)
-
exe = self.getBuildArtifact("a.out")
lldbutil.run_to_name_breakpoint(self, "main", exe_name=exe)
# We start tracing from main
@@ -52,9 +53,9 @@ def test_basic_flow(self):
self.expect("processor-trace show-instr-log -c 100",
patterns=[
# We expect to have seen the first instruction of 'fun'
- hex(fun_start_adddress),
+ hex(fun_start_adddress),
# We expect to see the exit condition of the for loop
- "at main.cpp:" + str(line_number('main.cpp', '// Break for loop'))
+ "at main.cpp:" + str(line_number('main.cpp', '// Break for loop'))
])
self.runCmd("processor-trace stop")
diff --git a/lldb/test/CMakeLists.txt b/lldb/test/CMakeLists.txt
index e86471609275..3cad416f923a 100644
--- a/lldb/test/CMakeLists.txt
+++ b/lldb/test/CMakeLists.txt
@@ -158,6 +158,7 @@ endif()
# These values are not canonicalized within LLVM.
llvm_canonicalize_cmake_booleans(
+ LLDB_BUILD_INTEL_PT
LLDB_ENABLE_PYTHON
LLDB_ENABLE_LUA
LLDB_ENABLE_LZMA
diff --git a/lldb/utils/lldb-dotest/CMakeLists.txt b/lldb/utils/lldb-dotest/CMakeLists.txt
index 7359613d7fb9..0278c370f7fe 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 edddaf4cd0c2..36d5fd38cc6d 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))
More information about the lldb-commits
mailing list