diff --git a/lldb/packages/Python/lldbsuite/test/configuration.py b/lldb/packages/Python/lldbsuite/test/configuration.py --- a/lldb/packages/Python/lldbsuite/test/configuration.py +++ b/lldb/packages/Python/lldbsuite/test/configuration.py @@ -134,6 +134,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 --- a/lldb/packages/Python/lldbsuite/test/dotest.py +++ b/lldb/packages/Python/lldbsuite/test/dotest.py @@ -456,6 +456,9 @@ 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 --- a/lldb/packages/Python/lldbsuite/test/dotest_args.py +++ b/lldb/packages/Python/lldbsuite/test/dotest_args.py @@ -177,6 +177,13 @@ 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/packages/Python/lldbsuite/test/lldbtest.py b/lldb/packages/Python/lldbsuite/test/lldbtest.py --- a/lldb/packages/Python/lldbsuite/test/lldbtest.py +++ b/lldb/packages/Python/lldbsuite/test/lldbtest.py @@ -490,6 +490,9 @@ # Keep track of the old current working directory. oldcwd = None + # The concrete subclass can override this optional attribute. + plugin = None + @staticmethod def compute_mydir(test_file): '''Subclasses should call this function to correctly calculate the @@ -730,6 +733,9 @@ #import traceback # traceback.print_stack() + if self.plugin and self.plugin not in configuration.enabled_plugins: + self.skipTest("The '" + self.plugin + "' plugin is not enabled") + if "LIBCXX_PATH" in os.environ: self.libcxxPath = os.environ["LIBCXX_PATH"] else: diff --git a/lldb/test/API/lit.cfg.py b/lldb/test/API/lit.cfg.py --- a/lldb/test/API/lit.cfg.py +++ b/lldb/test/API/lit.cfg.py @@ -116,6 +116,10 @@ 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 --- a/lldb/test/API/lit.site.cfg.py.in +++ b/lldb/test/API/lit.site.cfg.py.in @@ -32,6 +32,11 @@ 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 --- a/lldb/test/API/tools/intel-features/intel-pt/test/TestIntelPTSimpleBinary.py +++ b/lldb/test/API/tools/intel-features/intel-pt/test/TestIntelPTSimpleBinary.py @@ -12,24 +12,22 @@ class TestIntelPTSimpleBinary(TestBase): mydir = TestBase.compute_mydir(__file__) + plugin = 'intel-pt' NO_DEBUG_INFO_TESTCASE = True + def setUp(self): + TestBase.setUp(self) + + 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 +50,9 @@ 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 --- a/lldb/test/CMakeLists.txt +++ b/lldb/test/CMakeLists.txt @@ -158,6 +158,7 @@ # 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 --- a/lldb/utils/lldb-dotest/CMakeLists.txt +++ b/lldb/utils/lldb-dotest/CMakeLists.txt @@ -6,6 +6,10 @@ 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 --- a/lldb/utils/lldb-dotest/lldb-dotest.in +++ b/lldb/utils/lldb-dotest/lldb-dotest.in @@ -11,6 +11,7 @@ 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,7 +26,11 @@ 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)) sys.exit(subprocess.call(cmd))