From f17a85cf362c96b0e501402049ffe16b97c093a2 Mon Sep 17 00:00:00 2001 From: Walter Erquinigo Date: Wed, 15 Apr 2020 16:35:29 -0700 Subject: [PATCH] Revert "[intel-pt] Improve the way the test determines whether to run" This reverts commit da0e91fee614e8686f48db28e6507c8abe061fc2. There's a failure in http://lab.llvm.org:8011/builders/lldb-x86_64-debian/builds/8584 caused by a missing python object. --- .../Python/lldbsuite/test/configuration.py | 3 --- lldb/packages/Python/lldbsuite/test/dotest.py | 3 --- lldb/packages/Python/lldbsuite/test/dotest_args.py | 7 ------- lldb/test/API/lit.cfg.py | 4 ---- lldb/test/API/lit.site.cfg.py.in | 5 ----- .../intel-pt/test/TestIntelPTSimpleBinary.py | 23 +++++++++++----------- lldb/test/CMakeLists.txt | 1 - lldb/utils/lldb-dotest/CMakeLists.txt | 4 ---- lldb/utils/lldb-dotest/lldb-dotest.in | 3 --- 9 files changed, 11 insertions(+), 42 deletions(-) diff --git a/lldb/packages/Python/lldbsuite/test/configuration.py b/lldb/packages/Python/lldbsuite/test/configuration.py index ddae780..9d69438 100644 --- a/lldb/packages/Python/lldbsuite/test/configuration.py +++ b/lldb/packages/Python/lldbsuite/test/configuration.py @@ -137,9 +137,6 @@ all_tests = set() # 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 c4e4b61..b5666ec 100644 --- a/lldb/packages/Python/lldbsuite/test/dotest.py +++ b/lldb/packages/Python/lldbsuite/test/dotest.py @@ -467,9 +467,6 @@ 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 410097f..ad9508d 100644 --- a/lldb/packages/Python/lldbsuite/test/dotest_args.py +++ b/lldb/packages/Python/lldbsuite/test/dotest_args.py @@ -177,13 +177,6 @@ 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 662da7d..835e69e 100644 --- a/lldb/test/API/lit.cfg.py +++ b/lldb/test/API/lit.cfg.py @@ -127,10 +127,6 @@ if config.filecheck: 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 b50f59f..4e9413a 100644 --- a/lldb/test/API/lit.site.cfg.py.in +++ b/lldb/test/API/lit.site.cfg.py.in @@ -32,11 +32,6 @@ 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 91f1ea7..ea7f6a4 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,7 +7,6 @@ import time from lldbsuite.test.decorators import * from lldbsuite.test.lldbtest import * from lldbsuite.test import lldbutil -from lldbsuite.test import configuration class TestIntelPTSimpleBinary(TestBase): @@ -15,22 +14,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 @@ -53,9 +52,9 @@ class TestIntelPTSimpleBinary(TestBase): 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 3cad416..e864716 100644 --- a/lldb/test/CMakeLists.txt +++ b/lldb/test/CMakeLists.txt @@ -158,7 +158,6 @@ 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 0278c37..7359613 100644 --- a/lldb/utils/lldb-dotest/CMakeLists.txt +++ b/lldb/utils/lldb-dotest/CMakeLists.txt @@ -6,10 +6,6 @@ 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 36d5fd3..edddaf4 100755 --- a/lldb/utils/lldb-dotest/lldb-dotest.in +++ b/lldb/utils/lldb-dotest/lldb-dotest.in @@ -11,7 +11,6 @@ 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:] @@ -26,8 +25,6 @@ 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)) -- 2.7.4