diff options
Diffstat (limited to 'lldb/test')
79 files changed, 295 insertions, 221 deletions
| diff --git a/lldb/test/API/commands/register/register/aarch64_dynamic_regset/TestArm64DynamicRegsets.py b/lldb/test/API/commands/register/register/aarch64_dynamic_regset/TestArm64DynamicRegsets.py index eb121ec..a985ebb 100644 --- a/lldb/test/API/commands/register/register/aarch64_dynamic_regset/TestArm64DynamicRegsets.py +++ b/lldb/test/API/commands/register/register/aarch64_dynamic_regset/TestArm64DynamicRegsets.py @@ -97,6 +97,9 @@ class RegisterCommandsTestCase(TestBase):      @skipIf(oslist=no_match(["linux"]))      def test_aarch64_dynamic_regset_config(self):          """Test AArch64 Dynamic Register sets configuration.""" +        if not self.isAArch64SVE(): +            self.skipTest("SVE must be present") +          register_sets = self.setup_register_config_test()          for registerSet in register_sets: @@ -259,6 +262,8 @@ class RegisterCommandsTestCase(TestBase):      def test_aarch64_dynamic_regset_config_sme_write_za_to_enable(self):          """Test that ZA and ZT0 (if present) shows as 0s when disabled and          can be enabled by writing to ZA.""" +        if not self.isAArch64SVE(): +            self.skipTest("SVE must be present.")          if not self.isAArch64SME():              self.skipTest("SME must be present.") @@ -270,6 +275,8 @@ class RegisterCommandsTestCase(TestBase):      def test_aarch64_dynamic_regset_config_sme_write_zt0_to_enable(self):          """Test that ZA and ZT0 (if present) shows as 0s when disabled and          can be enabled by writing to ZT0.""" +        if not self.isAArch64SVE(): +            self.skipTest("SVE must be present.")          if not self.isAArch64SME():              self.skipTest("SME must be present.")          if not self.isAArch64SME2(): diff --git a/lldb/test/API/driver/stdio_closed/TestDriverWithClosedSTDIO.py b/lldb/test/API/driver/stdio_closed/TestDriverWithClosedSTDIO.py index 13437d0..a73322c 100644 --- a/lldb/test/API/driver/stdio_closed/TestDriverWithClosedSTDIO.py +++ b/lldb/test/API/driver/stdio_closed/TestDriverWithClosedSTDIO.py @@ -24,7 +24,7 @@ class TestDriverWithClosedSTDIO(TestBase):      # Windows doesn't have the fcntl module, so we can't run this      # test there. -    @skipIf(oslist=["windows"]) +    @skipIf(hostoslist=["windows"])      def test_run_lldb_and_wait(self):          """This test forks, closes the stdio channels and exec's lldb.          Then it waits for it to exit and asserts it did that successfully""" diff --git a/lldb/test/API/functionalities/breakpoint/same_cu_name/Makefile b/lldb/test/API/functionalities/breakpoint/same_cu_name/Makefile index b19e781..b508da2 100644 --- a/lldb/test/API/functionalities/breakpoint/same_cu_name/Makefile +++ b/lldb/test/API/functionalities/breakpoint/same_cu_name/Makefile @@ -4,16 +4,16 @@ LD_EXTRAS := ns1.o ns2.o ns3.o ns4.o  a.out: main.o ns1.o ns2.o ns3.o ns4.o  ns1.o: common.cpp -	$(CC) -gdwarf -c -DNAMESPACE=ns1 -o $@ $< +	$(CXX) -gdwarf -c -DNAMESPACE=ns1 -o $@ $<  ns2.o: common.cpp -	$(CC) -gdwarf -c -DNAMESPACE=ns2 -o $@ $< +	$(CXX) -gdwarf -c -DNAMESPACE=ns2 -o $@ $<  ns3.o: common.cpp -	$(CC) -gdwarf -c -DNAMESPACE=ns3 -o $@ $< +	$(CXX) -gdwarf -c -DNAMESPACE=ns3 -o $@ $<  ns4.o: common.cpp -	$(CC) -gdwarf -c -DNAMESPACE=ns4 -o $@ $< +	$(CXX) -gdwarf -c -DNAMESPACE=ns4 -o $@ $<  include Makefile.rules diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx-simulators/optional/TestDataFormatterLibcxxOptionalSimulator.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx-simulators/optional/TestDataFormatterLibcxxOptionalSimulator.py index 3fefe87..7463f88 100644 --- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx-simulators/optional/TestDataFormatterLibcxxOptionalSimulator.py +++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx-simulators/optional/TestDataFormatterLibcxxOptionalSimulator.py @@ -53,6 +53,8 @@ for r in range(2):      # causing this test to fail. This was reverted in newer version of clang      # with commit 52a9ba7ca.      @skipIf(compiler="clang", compiler_version=["=", "17"]) +    @skipIf(compiler="clang", compiler_version=["=", "18"]) +    @skipIf(compiler="clang", compiler_version=["=", "19"])      @functools.wraps(LibcxxOptionalDataFormatterSimulatorTestCase._run_test)      def test_method(self, defines=defines):          LibcxxOptionalDataFormatterSimulatorTestCase._run_test(self, defines) diff --git a/lldb/test/API/functionalities/multiple-slides/TestMultipleSlides.py b/lldb/test/API/functionalities/multiple-slides/TestMultipleSlides.py index 3d6b27f..5fd2b76 100644 --- a/lldb/test/API/functionalities/multiple-slides/TestMultipleSlides.py +++ b/lldb/test/API/functionalities/multiple-slides/TestMultipleSlides.py @@ -29,10 +29,13 @@ class MultipleSlidesTestCase(TestBase):              first_sym.GetEndAddress().GetOffset()              - first_sym.GetStartAddress().GetOffset()          ) +        int_size = target.FindFirstType("int").GetByteSize() +        self.assertGreaterEqual(first_size, 2048 * int_size)          second_size = (              second_sym.GetEndAddress().GetOffset()              - second_sym.GetStartAddress().GetOffset()          ) +        self.assertGreaterEqual(second_size, 2048 * int_size)          # View the first element of `first` and `second` while          # they have no load address set. diff --git a/lldb/test/API/lang/cpp/libcxx-internals-recognizer/TestLibcxxInternalsRecognizer.py b/lldb/test/API/lang/cpp/libcxx-internals-recognizer/TestLibcxxInternalsRecognizer.py index d8a729b..2f942da 100644 --- a/lldb/test/API/lang/cpp/libcxx-internals-recognizer/TestLibcxxInternalsRecognizer.py +++ b/lldb/test/API/lang/cpp/libcxx-internals-recognizer/TestLibcxxInternalsRecognizer.py @@ -9,7 +9,7 @@ class LibCxxInternalsRecognizerTestCase(TestBase):      NO_DEBUG_INFO_TESTCASE = True      @add_test_categories(["libc++"]) -    @skipIf(compiler="clang", compiler_version=["<", "19.0"]) +    @skipIf(compiler="clang", compiler_version=["<=", "19.0"])      def test_frame_recognizer(self):          """Test that implementation details of libc++ are hidden"""          self.build() diff --git a/lldb/test/API/lang/objc/real-definition/TestRealDefinition.py b/lldb/test/API/lang/objc/real-definition/TestRealDefinition.py index 6cbb9dd..9fb2bea9 100644 --- a/lldb/test/API/lang/objc/real-definition/TestRealDefinition.py +++ b/lldb/test/API/lang/objc/real-definition/TestRealDefinition.py @@ -27,13 +27,11 @@ class TestRealDefinition(TestBase):          # Run at stop at main          lldbutil.check_breakpoint(self, bpno=1, expected_hit_count=1) -        self.runCmd("settings set target.prefer-dynamic-value no-dynamic-values") -          # This should display correctly.          self.expect(              "frame variable foo->_bar->_hidden_ivar",              VARIABLES_DISPLAYED_CORRECTLY, -            substrs=["(NSString *)", "foo->_bar->_hidden_ivar = 0x"], +            substrs=["foo->_bar->_hidden_ivar = 0x"],          )      def test_frame_var_after_stop_at_implementation(self): @@ -54,11 +52,9 @@ class TestRealDefinition(TestBase):          # Run at stop at main          lldbutil.check_breakpoint(self, bpno=1, expected_hit_count=1) -        self.runCmd("settings set target.prefer-dynamic-value no-dynamic-values") -          # This should display correctly.          self.expect(              "frame variable foo->_bar->_hidden_ivar",              VARIABLES_DISPLAYED_CORRECTLY, -            substrs=["(NSString *)", "foo->_bar->_hidden_ivar = 0x"], +            substrs=["foo->_bar->_hidden_ivar = 0x"],          ) diff --git a/lldb/test/API/lua_api/TestThreadAPI.lua b/lldb/test/API/lua_api/TestThreadAPI.lua new file mode 100644 index 0000000..5a38d0b --- /dev/null +++ b/lldb/test/API/lua_api/TestThreadAPI.lua @@ -0,0 +1,25 @@ +_T = require('lua_lldb_test').create_test('TestThreadAPI') + +function _T:TestGetStopDescription() +    local target = self:create_target() +    local breakpoint = target:BreakpointCreateByName("main", "a.out") +    assertTrue(breakpoint:IsValid() and breakpoint:GetNumLocations() == 1) + +    local process = target:LaunchSimple({ 'arg1', 'arg2' }, nil, nil) +    local thread = get_stopped_thread(process, lldb.eStopReasonBreakpoint) +    assertNotNil(thread) +    assertTrue(thread:IsValid()) + +    assertEqual("breakpoint", thread:GetStopDescription(string.len("breakpoint") + 1)) +    assertEqual("break", thread:GetStopDescription(string.len("break") + 1)) +    assertEqual("b", thread:GetStopDescription(string.len("b") + 1)) +    assertEqual("breakpoint 1.1", thread:GetStopDescription(string.len("breakpoint 1.1") + 100)) + +    -- Test stream variation +    local stream = lldb.SBStream() +    assertTrue(thread:GetStopDescription(stream)) +    assertNotNil(stream) +    assertEqual("breakpoint 1.1", stream:GetData()) +end + +os.exit(_T:run()) diff --git a/lldb/test/API/python_api/default-constructor/sb_thread.py b/lldb/test/API/python_api/default-constructor/sb_thread.py index 34eb3db..4252fa0 100644 --- a/lldb/test/API/python_api/default-constructor/sb_thread.py +++ b/lldb/test/API/python_api/default-constructor/sb_thread.py @@ -10,6 +10,7 @@ def fuzz_obj(obj):      obj.GetStopReasonDataCount()      obj.GetStopReasonDataAtIndex(100)      obj.GetStopDescription(256) +    obj.GetStopDescription(lldb.SBStream())      obj.GetThreadID()      obj.GetIndexID()      obj.GetName() diff --git a/lldb/test/API/python_api/thread/TestThreadAPI.py b/lldb/test/API/python_api/thread/TestThreadAPI.py index 5583434a..acad758 100644 --- a/lldb/test/API/python_api/thread/TestThreadAPI.py +++ b/lldb/test/API/python_api/thread/TestThreadAPI.py @@ -138,6 +138,11 @@ class ThreadAPITestCase(TestBase):              "breakpoint 1.1", thread.GetStopDescription(len("breakpoint 1.1") + 100)          ) +        # Test the stream variation +        stream = lldb.SBStream() +        self.assertTrue(thread.GetStopDescription(stream)) +        self.assertEqual("breakpoint 1.1", stream.GetData()) +      def step_out_of_malloc_into_function_b(self, exe_name):          """Test Python SBThread.StepOut() API to step out of a malloc call where the call site is at function b()."""          exe = self.getBuildArtifact(exe_name) diff --git a/lldb/test/API/tools/lldb-dap/breakpoint-events/TestDAP_breakpointEvents.py b/lldb/test/API/tools/lldb-dap/breakpoint-events/TestDAP_breakpointEvents.py index beab4d6..7b78541 100644 --- a/lldb/test/API/tools/lldb-dap/breakpoint-events/TestDAP_breakpointEvents.py +++ b/lldb/test/API/tools/lldb-dap/breakpoint-events/TestDAP_breakpointEvents.py @@ -81,24 +81,20 @@ class TestDAP_breakpointEvents(lldbdap_testcase.DAPTestCaseBase):                  breakpoint["verified"], "expect foo breakpoint to not be verified"              ) -        # Flush the breakpoint events. -        self.dap_server.wait_for_breakpoint_events() -          # Continue to the breakpoint -        self.continue_to_breakpoints(dap_breakpoint_ids) +        self.continue_to_breakpoint(foo_bp_id) +        self.continue_to_next_stop()  # foo_bp2 +        self.continue_to_breakpoint(main_bp_id) +        self.continue_to_exit() -        verified_breakpoint_ids = [] -        unverified_breakpoint_ids = [] -        for breakpoint_event in self.dap_server.wait_for_breakpoint_events(): -            breakpoint = breakpoint_event["body"]["breakpoint"] -            id = breakpoint["id"] -            if breakpoint["verified"]: -                verified_breakpoint_ids.append(id) -            else: -                unverified_breakpoint_ids.append(id) +        bp_events = [e for e in self.dap_server.events if e["event"] == "breakpoint"] -        self.assertIn(main_bp_id, unverified_breakpoint_ids) -        self.assertIn(foo_bp_id, unverified_breakpoint_ids) +        main_bp_events = [ +            e for e in bp_events if e["body"]["breakpoint"]["id"] == main_bp_id +        ] +        foo_bp_events = [ +            e for e in bp_events if e["body"]["breakpoint"]["id"] == foo_bp_id +        ] -        self.assertIn(main_bp_id, verified_breakpoint_ids) -        self.assertIn(foo_bp_id, verified_breakpoint_ids) +        self.assertTrue(main_bp_events) +        self.assertTrue(foo_bp_events) diff --git a/lldb/test/API/tools/lldb-dap/coreFile/TestDAP_coreFile.py b/lldb/test/API/tools/lldb-dap/coreFile/TestDAP_coreFile.py index 1143cd9..d56a8a4 100644 --- a/lldb/test/API/tools/lldb-dap/coreFile/TestDAP_coreFile.py +++ b/lldb/test/API/tools/lldb-dap/coreFile/TestDAP_coreFile.py @@ -61,6 +61,21 @@ class TestDAP_coreFile(lldbdap_testcase.DAPTestCaseBase):          self.dap_server.request_next(threadId=32259)          self.assertEqual(self.get_stackFrames(), expected_frames) +    def test_wrong_core_file(self): +        exe_file = self.getSourcePath("linux-x86_64.out") +        wrong_core_file = self.getSourcePath("main.c") + +        self.create_debug_adapter() +        resp = self.attach( +            program=exe_file, coreFile=wrong_core_file, expectFailure=True +        ) +        self.assertIsNotNone(resp) +        self.assertFalse(resp["success"], "Expected failure in response {resp!r}") +        error_msg = resp["body"]["error"]["format"] + +        # attach may fail for mutilple reasons. +        self.assertEqual(error_msg, "Failed to create the process") +      @skipIfLLVMTargetMissing("X86")      def test_core_file_source_mapping_array(self):          """Test that sourceMap property is correctly applied when loading a core""" diff --git a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch.py b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch.py index 8db2316..09b1322 100644 --- a/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch.py +++ b/lldb/test/API/tools/lldb-dap/launch/TestDAP_launch.py @@ -156,6 +156,7 @@ class TestDAP_launch(lldbdap_testcase.DAPTestCaseBase):          self.build_and_launch(              program, debuggerRoot=program_parent_dir, initCommands=commands          ) +        self.continue_to_exit()          output = self.get_console()          self.assertTrue(output and len(output) > 0, "expect console output")          lines = output.splitlines() @@ -171,7 +172,6 @@ class TestDAP_launch(lldbdap_testcase.DAPTestCaseBase):                      % (program_parent_dir, line[len(prefix) :]),                  )          self.assertTrue(found, "verified lldb-dap working directory") -        self.continue_to_exit()      def test_sourcePath(self):          """ @@ -642,6 +642,7 @@ class TestDAP_launch(lldbdap_testcase.DAPTestCaseBase):      @skipIfAsan      @skipIfWindows      @skipIf(oslist=["linux"], archs=no_match(["x86_64"])) +    @skipIfBuildType(["debug"])      def test_stdio_redirection_and_console(self):          """          Test stdio redirection and console. diff --git a/lldb/test/API/tools/lldb-dap/module-event/TestDAP_module_event.py b/lldb/test/API/tools/lldb-dap/module-event/TestDAP_module_event.py index 1f4afab..9d1d17b 100644 --- a/lldb/test/API/tools/lldb-dap/module-event/TestDAP_module_event.py +++ b/lldb/test/API/tools/lldb-dap/module-event/TestDAP_module_event.py @@ -1,58 +1,58 @@ -import dap_server +""" +Test 'module' events for dynamically loaded libraries. +""" +  from lldbsuite.test.decorators import *  from lldbsuite.test.lldbtest import * -from lldbsuite.test import lldbutil  import lldbdap_testcase -import re  class TestDAP_module_event(lldbdap_testcase.DAPTestCaseBase): +    def lookup_module_id(self, name): +        """Returns the identifier for the first module event starting with the given name.""" +        for event in self.dap_server.module_events: +            if self.get_dict_value(event, ["body", "module", "name"]).startswith(name): +                return self.get_dict_value(event, ["body", "module", "id"]) +        self.fail(f"No module events matching name={name}") + +    def module_events(self, id): +        """Finds all module events by identifier.""" +        return [ +            event +            for event in self.dap_server.module_events +            if self.get_dict_value(event, ["body", "module", "id"]) == id +        ] + +    def module_reasons(self, events): +        """Returns the list of 'reason' values from the given events.""" +        return [event["body"]["reason"] for event in events] +      @skipIfWindows      def test_module_event(self): +        """ +        Test that module events are fired on target load and when the list of +        dynamic libraries updates while running. +        """          program = self.getBuildArtifact("a.out")          self.build_and_launch(program) +        # We can analyze the order of events after the process exits. +        self.continue_to_exit() -        source = "main.cpp" -        breakpoint1_line = line_number(source, "// breakpoint 1") -        breakpoint2_line = line_number(source, "// breakpoint 2") -        breakpoint3_line = line_number(source, "// breakpoint 3") +        a_out_id = self.lookup_module_id("a.out") +        a_out_events = self.module_events(id=a_out_id) -        breakpoint_ids = self.set_source_breakpoints( -            source, [breakpoint1_line, breakpoint2_line, breakpoint3_line] +        self.assertIn( +            "new", +            self.module_reasons(a_out_events), +            "Expected a.out to load during the debug session.",          ) -        self.continue_to_breakpoints(breakpoint_ids) - -        # We're now stopped at breakpoint 1 before the dlopen. Flush all the module events. -        event = self.dap_server.wait_for_event(["module"]) -        while event is not None: -            event = self.dap_server.wait_for_event(["module"]) - -        # Continue to the second breakpoint, before the dlclose. -        self.continue_to_breakpoints(breakpoint_ids) - -        # Make sure we got a module event for libother. -        event = self.dap_server.wait_for_event(["module"]) -        self.assertIsNotNone(event, "didn't get a module event") -        module_name = event["body"]["module"]["name"] -        module_id = event["body"]["module"]["id"] -        self.assertEqual(event["body"]["reason"], "new") -        self.assertIn("libother", module_name) - -        # Continue to the third breakpoint, after the dlclose. -        self.continue_to_breakpoints(breakpoint_ids) - -        # Make sure we got a module event for libother. -        event = self.dap_server.wait_for_event(["module"]) -        self.assertIsNotNone(event, "didn't get a module event") -        reason = event["body"]["reason"] -        self.assertEqual(reason, "removed") -        self.assertEqual(event["body"]["module"]["id"], module_id) - -        # The removed module event should omit everything but the module id and name -        # as they are required fields. -        module_data = event["body"]["module"] -        required_keys = ["id", "name"] -        self.assertListEqual(list(module_data.keys()), required_keys) -        self.assertEqual(module_data["name"], "", "expects empty name.") -        self.continue_to_exit() +        libother_id = self.lookup_module_id( +            "libother."  # libother.so or libother.dylib based on OS. +        ) +        libother_events = self.module_events(id=libother_id) +        self.assertEqual( +            self.module_reasons(libother_events), +            ["new", "removed"], +            "Expected libother to be loaded then unloaded during the debug session.", +        ) diff --git a/lldb/test/API/tools/lldb-dap/module/TestDAP_module.py b/lldb/test/API/tools/lldb-dap/module/TestDAP_module.py index 0ed53da..2d00c51 100644 --- a/lldb/test/API/tools/lldb-dap/module/TestDAP_module.py +++ b/lldb/test/API/tools/lldb-dap/module/TestDAP_module.py @@ -64,19 +64,18 @@ class TestDAP_module(lldbdap_testcase.DAPTestCaseBase):          self.assertEqual(program, program_module["path"])          self.assertIn("addressRange", program_module) +        self.continue_to_exit() +          # Collect all the module names we saw as events.          module_new_names = []          module_changed_names = [] -        module_event = self.dap_server.wait_for_event(["module"]) -        while module_event is not None: +        for module_event in self.dap_server.module_events:              reason = module_event["body"]["reason"]              if reason == "new":                  module_new_names.append(module_event["body"]["module"]["name"])              elif reason == "changed":                  module_changed_names.append(module_event["body"]["module"]["name"]) -            module_event = self.dap_server.wait_for_event(["module"]) -          # Make sure we got an event for every active module.          self.assertNotEqual(len(module_new_names), 0)          for module in active_modules: @@ -86,7 +85,6 @@ class TestDAP_module(lldbdap_testcase.DAPTestCaseBase):          # symbols got added.          self.assertNotEqual(len(module_changed_names), 0)          self.assertIn(program_module["name"], module_changed_names) -        self.continue_to_exit()      @skipIfWindows      def test_modules(self): diff --git a/lldb/test/API/tools/lldb-dap/restart/TestDAP_restart_console.py b/lldb/test/API/tools/lldb-dap/restart/TestDAP_restart_console.py index e1ad142..fa62ec2 100644 --- a/lldb/test/API/tools/lldb-dap/restart/TestDAP_restart_console.py +++ b/lldb/test/API/tools/lldb-dap/restart/TestDAP_restart_console.py @@ -30,7 +30,11 @@ class TestDAP_restart_console(lldbdap_testcase.DAPTestCaseBase):              if reason == "entry":                  seen_stopped_event += 1 -        self.assertEqual(seen_stopped_event, 1, "expect only one stopped entry event.") +        self.assertEqual( +            seen_stopped_event, +            1, +            f"expect only one stopped entry event in {stopped_events}", +        )      @skipIfAsan      @skipIfWindows @@ -92,11 +96,13 @@ class TestDAP_restart_console(lldbdap_testcase.DAPTestCaseBase):          self.build_and_launch(program, console="integratedTerminal", stopOnEntry=True)          [bp_main] = self.set_function_breakpoints(["main"]) -        self.dap_server.request_continue()  # sends configuration done -        stopped_events = self.dap_server.wait_for_stopped() +        self.dap_server.request_configurationDone() +        stopped_threads = list(self.dap_server.thread_stop_reasons.values())          # We should be stopped at the entry point. -        self.assertGreaterEqual(len(stopped_events), 0, "expect stopped events") -        self.verify_stopped_on_entry(stopped_events) +        self.assertEqual( +            len(stopped_threads), 1, "Expected the main thread to be stopped on entry." +        ) +        self.assertEqual(stopped_threads[0]["reason"], "entry")          # Then, if we continue, we should hit the breakpoint at main.          self.dap_server.request_continue() @@ -105,8 +111,12 @@ class TestDAP_restart_console(lldbdap_testcase.DAPTestCaseBase):          # Restart and check that we still get a stopped event before reaching          # main.          self.dap_server.request_restart() -        stopped_events = self.dap_server.wait_for_stopped() -        self.verify_stopped_on_entry(stopped_events) +        stopped_threads = list(self.dap_server.thread_stop_reasons.values()) +        # We should be stopped at the entry point. +        self.assertEqual( +            len(stopped_threads), 1, "Expected the main thread to be stopped on entry." +        ) +        self.assertEqual(stopped_threads[0]["reason"], "entry")          # continue to main          self.dap_server.request_continue() diff --git a/lldb/test/API/tools/lldb-dap/send-event/TestDAP_sendEvent.py b/lldb/test/API/tools/lldb-dap/send-event/TestDAP_sendEvent.py index a018456..0184020 100644 --- a/lldb/test/API/tools/lldb-dap/send-event/TestDAP_sendEvent.py +++ b/lldb/test/API/tools/lldb-dap/send-event/TestDAP_sendEvent.py @@ -32,7 +32,7 @@ class TestDAP_sendEvent(lldbdap_testcase.DAPTestCaseBase):              ],          )          self.set_source_breakpoints(source, [breakpoint_line]) -        self.continue_to_next_stop() +        self.do_continue()          custom_event = self.dap_server.wait_for_event(              filter=["my-custom-event-no-body"] diff --git a/lldb/test/Shell/Breakpoint/jit-loader_jitlink_elf.test b/lldb/test/Shell/Breakpoint/jit-loader_jitlink_elf.test index 52c86fa5..9a972f1 100644 --- a/lldb/test/Shell/Breakpoint/jit-loader_jitlink_elf.test +++ b/lldb/test/Shell/Breakpoint/jit-loader_jitlink_elf.test @@ -3,8 +3,8 @@  # JITLink is the Orc-specific JIT linker implementation.  # -# RUN: %clang -g -S -emit-llvm -fPIC --target=x86_64-unknown-unknown-elf \ -# RUN:        -o %t.ll %p/Inputs/jitbp.cpp +# RUN: %clangxx -g -S -emit-llvm -fPIC --target=x86_64-unknown-unknown-elf \ +# RUN:          -o %t.ll %p/Inputs/jitbp.cpp  # RUN: %lldb -b -o 'settings set plugin.jit-loader.gdb.enable on' -o 'b jitbp' \  # RUN:          -o 'run --jit-linker=jitlink %t.ll' lli | FileCheck %s diff --git a/lldb/test/Shell/Breakpoint/jit-loader_rtdyld_elf.test b/lldb/test/Shell/Breakpoint/jit-loader_rtdyld_elf.test index b34a567..ae9402a 100644 --- a/lldb/test/Shell/Breakpoint/jit-loader_rtdyld_elf.test +++ b/lldb/test/Shell/Breakpoint/jit-loader_rtdyld_elf.test @@ -3,8 +3,8 @@  # RuntimeDyld can be used to link and load emitted code for both, MCJIT and Orc.  # -# RUN: %clang -g -S -emit-llvm --target=x86_64-unknown-unknown-elf \ -# RUN:        -o %t.ll %p/Inputs/jitbp.cpp +# RUN: %clangxx -g -S -emit-llvm --target=x86_64-unknown-unknown-elf \ +# RUN:          -o %t.ll %p/Inputs/jitbp.cpp  #  # RUN: %lldb -b -o 'settings set plugin.jit-loader.gdb.enable on' -o 'b jitbp' \  # RUN:          -o 'run --jit-kind=mcjit %t.ll' lli | FileCheck %s diff --git a/lldb/test/Shell/Commands/command-image-dump-ast-colored.test b/lldb/test/Shell/Commands/command-image-dump-ast-colored.test index 355ef6b..7fd70d2 100644 --- a/lldb/test/Shell/Commands/command-image-dump-ast-colored.test +++ b/lldb/test/Shell/Commands/command-image-dump-ast-colored.test @@ -1,7 +1,7 @@  # Test AST dumping with and without color.  # RUN: split-file %s %t -# RUN: %clang_host -g -gdwarf %t/main.cpp -o %t.out +# RUN: %clangxx_host -g -gdwarf %t/main.cpp -o %t.out  # RUN: %lldb -x -b -s %t/commands.input %t.out -o exit 2>&1 \  # RUN:       | FileCheck %s diff --git a/lldb/test/Shell/Commands/command-image-dump-ast.test b/lldb/test/Shell/Commands/command-image-dump-ast.test index 3204022..86fe183 100644 --- a/lldb/test/Shell/Commands/command-image-dump-ast.test +++ b/lldb/test/Shell/Commands/command-image-dump-ast.test @@ -5,7 +5,7 @@  # UNSUPPORTED: system-windows  # RUN: split-file %s %t -# RUN: %clang_host -g -gdwarf %t/main.cpp -o %t.out +# RUN: %clangxx_host -g -gdwarf %t/main.cpp -o %t.out  # RUN: %lldb -x -b -s %t/commands.input %t.out -o exit 2>&1 \  # RUN:       | FileCheck %s diff --git a/lldb/test/Shell/Commands/list-header.test b/lldb/test/Shell/Commands/list-header.test index 53c4b786..27eaa1a 100644 --- a/lldb/test/Shell/Commands/list-header.test +++ b/lldb/test/Shell/Commands/list-header.test @@ -3,11 +3,11 @@  # XFAIL: target-windows  ## Test that `list header.h:<line>` works correctly when header is available. -##  +##  # RUN: split-file %s %t -# RUN: %clang_host -g %t/main_with_inlined.cc %t/foo.cc -o %t/main_with_inlined.out -# RUN: %clang_host -g %t/main_no_inlined.cc %t/foo.cc -o %t/main_no_inlined.out +# RUN: %clangxx_host -g %t/main_with_inlined.cc %t/foo.cc -o %t/main_with_inlined.out +# RUN: %clangxx_host -g %t/main_no_inlined.cc %t/foo.cc -o %t/main_no_inlined.out  # RUN: %lldb %t/main_with_inlined.out -o "list foo.h:2" -o "exit" 2>&1 \  # RUN:   | FileCheck %s --check-prefix=CHECK-INLINED @@ -19,7 +19,7 @@  # CHECK-INLINED: 2      extern int* ptr;  # CHECK-INLINED: 3   	void f(int x); -# CHECK-INLINED: 4   	 +# CHECK-INLINED: 4  # CHECK-INLINED: 5   	inline void g(int x) {  # CHECK-INLINED: 6   	  *ptr = x; // should crash here  # CHECK-INLINED: 7   	} diff --git a/lldb/test/Shell/Error/cleanup.cpp b/lldb/test/Shell/Error/cleanup.cpp index 6abc62d..1e83478 100644 --- a/lldb/test/Shell/Error/cleanup.cpp +++ b/lldb/test/Shell/Error/cleanup.cpp @@ -1,5 +1,5 @@  // Test CommandObject is cleaned up even after commands fail due to not taking any argument. -// RUN: %clang_host -g %s -o %t +// RUN: %clangxx_host -g %s -o %t  // RUN: %lldb -f %t -o "settings set interpreter.stop-command-source-on-error false" -s \  // RUN:   %S/Inputs/cleanup.lldbinit  int main() { return 0; } diff --git a/lldb/test/Shell/Expr/TestExprLanguageNote.test b/lldb/test/Shell/Expr/TestExprLanguageNote.test index e8e4e13..e7da308 100644 --- a/lldb/test/Shell/Expr/TestExprLanguageNote.test +++ b/lldb/test/Shell/Expr/TestExprLanguageNote.test @@ -1,5 +1,5 @@  # RUN: split-file %s %t -# RUN: %clang_host -g %t/main.cpp -o %t.out +# RUN: %clangxx_host -g %t/main.cpp -o %t.out  #  # RUN: %lldb -x -b -o "settings set interpreter.stop-command-source-on-error false" \  # RUN:       -s %t/no-target.input 2>&1 | FileCheck %s --check-prefix=CHECK-NO-TARGET diff --git a/lldb/test/Shell/Expr/TestLambdaExprImport.test b/lldb/test/Shell/Expr/TestLambdaExprImport.test index c57ce06..b49a380 100644 --- a/lldb/test/Shell/Expr/TestLambdaExprImport.test +++ b/lldb/test/Shell/Expr/TestLambdaExprImport.test @@ -3,7 +3,7 @@  # uses always).  # RUN: split-file %s %t -# RUN: %clang_host -g -gdwarf %t/main.cpp -o %t.out +# RUN: %clangxx_host -g -gdwarf %t/main.cpp -o %t.out  # RUN: %lldb -o "settings set interpreter.stop-command-source-on-error false" \  # RUN:       -x -b -s %t/commands.input %t.out 2>&1 \  # RUN:       | FileCheck %s diff --git a/lldb/test/Shell/ObjectFile/ELF/elf-memory.test b/lldb/test/Shell/ObjectFile/ELF/elf-memory.test index 75a68ed..170dc76 100644 --- a/lldb/test/Shell/ObjectFile/ELF/elf-memory.test +++ b/lldb/test/Shell/ObjectFile/ELF/elf-memory.test @@ -11,7 +11,7 @@  //   - verify that "image dump objfile" will dump the dynamic section of the  //     memory elf file and find the .dynamic string table. -// RUN: %clang_host %p/Inputs/memory-elf.cpp -g -O0 -o %t +// RUN: %clangxx_host %p/Inputs/memory-elf.cpp -g -O0 -o %t  // RUN: %lldb %t -b \  // RUN:   -o "b main" \ diff --git a/lldb/test/Shell/ObjectFile/MachO/Inputs/section-overflow-binary b/lldb/test/Shell/ObjectFile/MachO/Inputs/section-overflow-binaryBinary files differ new file mode 100644 index 0000000..19dc2f4 --- /dev/null +++ b/lldb/test/Shell/ObjectFile/MachO/Inputs/section-overflow-binary diff --git a/lldb/test/Shell/ObjectFile/MachO/section-overflow-binary.test b/lldb/test/Shell/ObjectFile/MachO/section-overflow-binary.test new file mode 100644 index 0000000..76c335f --- /dev/null +++ b/lldb/test/Shell/ObjectFile/MachO/section-overflow-binary.test @@ -0,0 +1,13 @@ +RUN: %lldb -b %p/Inputs/section-overflow-binary \ +RUN:   -o 'script dwarf = lldb.target.module[0].sections[0]' \ +RUN:   -o 'script section = dwarf.GetSubSectionAtIndex(0)' \ +RUN:   -o "script print(f'{section.GetName()} file_offset=0x{section.GetFileOffset():016x}')" \ +RUN:   -o 'script section = dwarf.GetSubSectionAtIndex(1)' \ +RUN:   -o "script print(f'{section.GetName()} file_offset=0x{section.GetFileOffset():016x}')" \ +RUN:   -o 'script section = dwarf.GetSubSectionAtIndex(2)' \ +RUN:   -o "script print(f'{section.GetName()} file_offset=0x{section.GetFileOffset():016x}')" \ +RUN:   | FileCheck %s + +CHECK: __debug_abbrev file_offset=0x00000000fffffff0 +CHECK: __debug_info file_offset=0x0000000100000010 +CHECK: __debug_line file_offset=0x0000000300000010 diff --git a/lldb/test/Shell/Recognizer/verbose_trap-in-stl-callback-user-leaf.test b/lldb/test/Shell/Recognizer/verbose_trap-in-stl-callback-user-leaf.test index 5a84c16..32b4095 100644 --- a/lldb/test/Shell/Recognizer/verbose_trap-in-stl-callback-user-leaf.test +++ b/lldb/test/Shell/Recognizer/verbose_trap-in-stl-callback-user-leaf.test @@ -12,7 +12,7 @@  # UNSUPPORTED: system-windows  # -# RUN: %clang_host -g -O0 %S/Inputs/verbose_trap-in-stl-callback-user-leaf.cpp -o %t.out +# RUN: %clangxx_host -g -O0 %S/Inputs/verbose_trap-in-stl-callback-user-leaf.cpp -o %t.out  # RUN: %lldb -b -s %s %t.out | FileCheck %s --check-prefixes=CHECK  run diff --git a/lldb/test/Shell/Recognizer/verbose_trap-in-stl-callback.test b/lldb/test/Shell/Recognizer/verbose_trap-in-stl-callback.test index b15bcb3..c8c433c 100644 --- a/lldb/test/Shell/Recognizer/verbose_trap-in-stl-callback.test +++ b/lldb/test/Shell/Recognizer/verbose_trap-in-stl-callback.test @@ -11,7 +11,7 @@  # UNSUPPORTED: system-windows  # -# RUN: %clang_host -g -O0 %S/Inputs/verbose_trap-in-stl-callback.cpp -o %t.out +# RUN: %clangxx_host -g -O0 %S/Inputs/verbose_trap-in-stl-callback.cpp -o %t.out  # RUN: %lldb -b -s %s %t.out | FileCheck %s --check-prefixes=CHECK  run diff --git a/lldb/test/Shell/Recognizer/verbose_trap-in-stl-max-depth.test b/lldb/test/Shell/Recognizer/verbose_trap-in-stl-max-depth.test index 2ea6594..d0789ac 100644 --- a/lldb/test/Shell/Recognizer/verbose_trap-in-stl-max-depth.test +++ b/lldb/test/Shell/Recognizer/verbose_trap-in-stl-max-depth.test @@ -4,7 +4,7 @@  # UNSUPPORTED: system-windows  # -# RUN: %clang_host -g -O0 %S/Inputs/verbose_trap-in-stl-max-depth.cpp -o %t.out +# RUN: %clangxx_host -g -O0 %S/Inputs/verbose_trap-in-stl-max-depth.cpp -o %t.out  # RUN: %lldb -b -s %s %t.out | FileCheck %s --check-prefixes=CHECK  run diff --git a/lldb/test/Shell/Recognizer/verbose_trap-in-stl-nested.test b/lldb/test/Shell/Recognizer/verbose_trap-in-stl-nested.test index 81a492d..68a4ea6 100644 --- a/lldb/test/Shell/Recognizer/verbose_trap-in-stl-nested.test +++ b/lldb/test/Shell/Recognizer/verbose_trap-in-stl-nested.test @@ -3,7 +3,7 @@  # UNSUPPORTED: system-windows  # -# RUN: %clang_host -g -O0 %S/Inputs/verbose_trap-in-stl-nested.cpp -o %t.out +# RUN: %clangxx_host -g -O0 %S/Inputs/verbose_trap-in-stl-nested.cpp -o %t.out  # RUN: %lldb -b -s %s %t.out | FileCheck %s --check-prefixes=CHECK  run diff --git a/lldb/test/Shell/Recognizer/verbose_trap-in-stl.test b/lldb/test/Shell/Recognizer/verbose_trap-in-stl.test index dd08290..bd48511 100644 --- a/lldb/test/Shell/Recognizer/verbose_trap-in-stl.test +++ b/lldb/test/Shell/Recognizer/verbose_trap-in-stl.test @@ -3,7 +3,7 @@  # UNSUPPORTED: system-windows  # -# RUN: %clang_host -g -O0 %S/Inputs/verbose_trap-in-stl.cpp -o %t.out +# RUN: %clangxx_host -g -O0 %S/Inputs/verbose_trap-in-stl.cpp -o %t.out  # RUN: %lldb -b -s %s %t.out | FileCheck %s --check-prefixes=CHECK  run diff --git a/lldb/test/Shell/Recognizer/verbose_trap.test b/lldb/test/Shell/Recognizer/verbose_trap.test index dafab7b..ab0df08 100644 --- a/lldb/test/Shell/Recognizer/verbose_trap.test +++ b/lldb/test/Shell/Recognizer/verbose_trap.test @@ -1,15 +1,15 @@  # UNSUPPORTED: system-windows  # -# RUN: %clang_host -g -O0 %S/Inputs/verbose_trap.cpp -o %t.out -DVERBOSE_TRAP_TEST_CATEGORY=\"Foo\" -DVERBOSE_TRAP_TEST_MESSAGE=\"Bar\" +# RUN: %clangxx_host -g -O0 %S/Inputs/verbose_trap.cpp -o %t.out -DVERBOSE_TRAP_TEST_CATEGORY=\"Foo\" -DVERBOSE_TRAP_TEST_MESSAGE=\"Bar\"  # RUN: %lldb -b -s %s %t.out | FileCheck %s --check-prefixes=CHECK,CHECK-BOTH  # -# RUN: %clang_host -g -O0 %S/Inputs/verbose_trap.cpp -o %t.out -DVERBOSE_TRAP_TEST_CATEGORY=\"\" -DVERBOSE_TRAP_TEST_MESSAGE=\"Bar\" +# RUN: %clangxx_host -g -O0 %S/Inputs/verbose_trap.cpp -o %t.out -DVERBOSE_TRAP_TEST_CATEGORY=\"\" -DVERBOSE_TRAP_TEST_MESSAGE=\"Bar\"  # RUN: %lldb -b -s %s %t.out | FileCheck %s --check-prefixes=CHECK,CHECK-MESSAGE_ONLY  # -# RUN: %clang_host -g -O0 %S/Inputs/verbose_trap.cpp -o %t.out -DVERBOSE_TRAP_TEST_CATEGORY=\"Foo\" -DVERBOSE_TRAP_TEST_MESSAGE=\"\" +# RUN: %clangxx_host -g -O0 %S/Inputs/verbose_trap.cpp -o %t.out -DVERBOSE_TRAP_TEST_CATEGORY=\"Foo\" -DVERBOSE_TRAP_TEST_MESSAGE=\"\"  # RUN: %lldb -b -s %s %t.out | FileCheck %s --check-prefixes=CHECK,CHECK-CATEGORY_ONLY  # -# RUN: %clang_host -g -O0 %S/Inputs/verbose_trap.cpp -o %t.out -DVERBOSE_TRAP_TEST_CATEGORY=\"\" -DVERBOSE_TRAP_TEST_MESSAGE=\"\" +# RUN: %clangxx_host -g -O0 %S/Inputs/verbose_trap.cpp -o %t.out -DVERBOSE_TRAP_TEST_CATEGORY=\"\" -DVERBOSE_TRAP_TEST_MESSAGE=\"\"  # RUN: %lldb -b -s %s %t.out | FileCheck %s --check-prefixes=CHECK,CHECK-NONE  run diff --git a/lldb/test/Shell/Register/Inputs/x86-multithread-read.cpp b/lldb/test/Shell/Register/Inputs/x86-multithread-read.cpp index c5f571f..0d2869c 100644 --- a/lldb/test/Shell/Register/Inputs/x86-multithread-read.cpp +++ b/lldb/test/Shell/Register/Inputs/x86-multithread-read.cpp @@ -1,4 +1,5 @@  #include <cstdint> +#include <functional>  #include <mutex>  #include <thread> diff --git a/lldb/test/Shell/Register/Inputs/x86-multithread-write.cpp b/lldb/test/Shell/Register/Inputs/x86-multithread-write.cpp index 320f9e9..1f4e91ac 100644 --- a/lldb/test/Shell/Register/Inputs/x86-multithread-write.cpp +++ b/lldb/test/Shell/Register/Inputs/x86-multithread-write.cpp @@ -1,6 +1,7 @@  #include <cinttypes>  #include <cstdint>  #include <cstdio> +#include <functional>  #include <mutex>  #include <thread> diff --git a/lldb/test/Shell/Settings/TestChildCountTruncation.test b/lldb/test/Shell/Settings/TestChildCountTruncation.test index da6436c..b66d0df 100644 --- a/lldb/test/Shell/Settings/TestChildCountTruncation.test +++ b/lldb/test/Shell/Settings/TestChildCountTruncation.test @@ -2,7 +2,7 @@  # when target.max-children-count wasn't explicitly set.  # RUN: split-file %s %t -# RUN: %clang_host -g %t/main.cpp -o %t.out +# RUN: %clangxx_host -g %t/main.cpp -o %t.out  # RUN: %lldb -x -b -s %t/dwim-commands.input %t.out -o exit 2>&1 \  # RUN:       | FileCheck %s --check-prefix=DWIM  # diff --git a/lldb/test/Shell/Settings/TestChildDepthTruncation.test b/lldb/test/Shell/Settings/TestChildDepthTruncation.test index 12f5661..7e4fbbe 100644 --- a/lldb/test/Shell/Settings/TestChildDepthTruncation.test +++ b/lldb/test/Shell/Settings/TestChildDepthTruncation.test @@ -2,7 +2,7 @@  # when target.max-children-depth wasn't explicitly set.  # RUN: split-file %s %t -# RUN: %clang_host -g %t/main.cpp -o %t.out +# RUN: %clangxx_host -g %t/main.cpp -o %t.out  # RUN: %lldb -x -b -s %t/dwim-commands.input %t.out -o exit 2>&1 \  # RUN:       | FileCheck %s --check-prefix=DWIM  # diff --git a/lldb/test/Shell/Settings/TestCxxFrameFormat.test b/lldb/test/Shell/Settings/TestCxxFrameFormat.test index d70db58..3ee92d5 100644 --- a/lldb/test/Shell/Settings/TestCxxFrameFormat.test +++ b/lldb/test/Shell/Settings/TestCxxFrameFormat.test @@ -3,7 +3,7 @@  # Test the plugin.cplusplus.display.function-name-format setting.  # RUN: split-file %s %t -# RUN: %clang_host -g -gdwarf %t/main.cpp -o %t.out +# RUN: %clangxx_host -g -gdwarf %t/main.cpp -o %t.out  # RUN: %lldb -x -b -s %t/commands.input %t.out -o exit 2>&1 \  # RUN:       | FileCheck %s diff --git a/lldb/test/Shell/Settings/TestCxxFrameFormatEmpty.test b/lldb/test/Shell/Settings/TestCxxFrameFormatEmpty.test index 0a6d272..a0550b7 100644 --- a/lldb/test/Shell/Settings/TestCxxFrameFormatEmpty.test +++ b/lldb/test/Shell/Settings/TestCxxFrameFormatEmpty.test @@ -5,7 +5,7 @@  # ${function.name-with-args}.  # RUN: split-file %s %t -# RUN: %clang_host -g -gdwarf %t/main.cpp -o %t.out +# RUN: %clangxx_host -g -gdwarf %t/main.cpp -o %t.out  # RUN: %lldb -x -b -s %t/commands.input %t.out -o exit 2>&1 \  # RUN:       | FileCheck %s diff --git a/lldb/test/Shell/Settings/TestCxxFrameFormatMixedLanguages.test b/lldb/test/Shell/Settings/TestCxxFrameFormatMixedLanguages.test index bafd36f..679d6e4 100644 --- a/lldb/test/Shell/Settings/TestCxxFrameFormatMixedLanguages.test +++ b/lldb/test/Shell/Settings/TestCxxFrameFormatMixedLanguages.test @@ -4,9 +4,9 @@  # when interoperating multiple languages.  # RUN: split-file %s %t -# RUN: %clangxx_host -x c -c -g %t/lib.c -o %t.clib.o +# RUN: %clang_host -x c -c -g %t/lib.c -o %t.clib.o  # RUN: %clangxx_host -c -g %t/lib.cpp -o %t.cxxlib.o -# RUN: %clangxx_host %t/main.m %t.cxxlib.o %t.clib.o -o %t.out +# RUN: %clang_host %t/main.m %t.cxxlib.o %t.clib.o -o %t.out  # RUN: %lldb -x -b -s %t/commands.input %t.out -o exit 2>&1 | FileCheck %s  #--- lib.c @@ -47,7 +47,7 @@ break set -n method  run  bt -# CHECK: custom-frame 'this affects C++ only'  -# CHECK: custom-frame 'this affects C++ only'  -# CHECK: custom-frame 'func'  -# CHECK: custom-frame 'main'  +# CHECK: custom-frame 'this affects C++ only' +# CHECK: custom-frame 'this affects C++ only' +# CHECK: custom-frame 'func' +# CHECK: custom-frame 'main' diff --git a/lldb/test/Shell/Settings/TestCxxFrameFormatPartialFailure.test b/lldb/test/Shell/Settings/TestCxxFrameFormatPartialFailure.test index e914ff7..f279f07 100644 --- a/lldb/test/Shell/Settings/TestCxxFrameFormatPartialFailure.test +++ b/lldb/test/Shell/Settings/TestCxxFrameFormatPartialFailure.test @@ -5,7 +5,7 @@  # were successful.  # RUN: split-file %s %t -# RUN: %clang_host -g -gdwarf %t/main.cpp -o %t.out +# RUN: %clangxx_host -g -gdwarf %t/main.cpp -o %t.out  # RUN: %lldb -x -b -s %t/commands.input %t.out -o exit 2>&1 \  # RUN:       | FileCheck %s diff --git a/lldb/test/Shell/Settings/TestFrameFormatFunctionBasename.test b/lldb/test/Shell/Settings/TestFrameFormatFunctionBasename.test index c0008e5..56ec09e 100644 --- a/lldb/test/Shell/Settings/TestFrameFormatFunctionBasename.test +++ b/lldb/test/Shell/Settings/TestFrameFormatFunctionBasename.test @@ -3,11 +3,11 @@  # Test the ${function.basename} frame-format variable.  # RUN: split-file %s %t -# RUN: %clang_host -g -gdwarf %t/main.cpp -o %t.out +# RUN: %clangxx_host -g -gdwarf %t/main.cpp -o %t.out  # RUN: %lldb -x -b -s %t/commands.input %t.out -o exit 2>&1 \  # RUN:       | FileCheck %s  # -# RUN: %clang_host -O0 %t/main.cpp -o %t-nodebug.out +# RUN: %clangxx_host -O0 %t/main.cpp -o %t-nodebug.out  # RUN: %lldb -x -b -s %t/commands.input %t-nodebug.out -o exit 2>&1 \  # RUN:       | FileCheck %s diff --git a/lldb/test/Shell/Settings/TestFrameFormatFunctionFormattedArguments.test b/lldb/test/Shell/Settings/TestFrameFormatFunctionFormattedArguments.test index 04f5170..f20fc8c 100644 --- a/lldb/test/Shell/Settings/TestFrameFormatFunctionFormattedArguments.test +++ b/lldb/test/Shell/Settings/TestFrameFormatFunctionFormattedArguments.test @@ -3,11 +3,11 @@  # Test the ${function.formatted-arguments} frame-format variable.  # RUN: split-file %s %t -# RUN: %clang_host -g -gdwarf %t/main.cpp -o %t.out +# RUN: %clangxx_host -g -gdwarf %t/main.cpp -o %t.out  # RUN: %lldb -x -b -s %t/commands.input %t.out -o exit 2>&1 \  # RUN:       | FileCheck %s  # -# RUN: %clang_host -O0 %t/main.cpp -o %t-nodebug.out +# RUN: %clangxx_host -O0 %t/main.cpp -o %t-nodebug.out  # RUN: %lldb -x -b -s %t/commands.input %t-nodebug.out -o exit 2>&1 \  # RUN:       | FileCheck %s --check-prefix=CHECK-NODEBUG diff --git a/lldb/test/Shell/Settings/TestFrameFormatFunctionQualifiers.test b/lldb/test/Shell/Settings/TestFrameFormatFunctionQualifiers.test index b1dfe83..d05e60b 100644 --- a/lldb/test/Shell/Settings/TestFrameFormatFunctionQualifiers.test +++ b/lldb/test/Shell/Settings/TestFrameFormatFunctionQualifiers.test @@ -3,11 +3,11 @@  # Test the ${function.qualifiers} frame-format variable.  # RUN: split-file %s %t -# RUN: %clang_host -g -gdwarf %t/main.cpp -o %t.out +# RUN: %clangxx_host -g -gdwarf %t/main.cpp -o %t.out  # RUN: %lldb -x -b -s %t/commands.input %t.out -o exit 2>&1 \  # RUN:       | FileCheck %s  # -# RUN: %clang_host -O0 %t/main.cpp -o %t-nodebug.out +# RUN: %clangxx_host -O0 %t/main.cpp -o %t-nodebug.out  # RUN: %lldb -x -b -s %t/commands.input %t-nodebug.out -o exit 2>&1 \  # RUN:       | FileCheck %s diff --git a/lldb/test/Shell/Settings/TestFrameFormatFunctionReturn.test b/lldb/test/Shell/Settings/TestFrameFormatFunctionReturn.test index f913162..bb78258 100644 --- a/lldb/test/Shell/Settings/TestFrameFormatFunctionReturn.test +++ b/lldb/test/Shell/Settings/TestFrameFormatFunctionReturn.test @@ -4,11 +4,11 @@  # frame-format variables.  # RUN: split-file %s %t -# RUN: %clang_host -g -gdwarf %t/main.cpp -o %t.out +# RUN: %clangxx_host -g -gdwarf %t/main.cpp -o %t.out  # RUN: %lldb -x -b -s %t/commands.input %t.out -o exit 2>&1 \  # RUN:       | FileCheck %s  # -# RUN: %clang_host -O0 %t/main.cpp -o %t-nodebug.out +# RUN: %clangxx_host -O0 %t/main.cpp -o %t-nodebug.out  # RUN: %lldb -x -b -s %t/commands.input %t-nodebug.out -o exit 2>&1 \  # RUN:       | FileCheck %s diff --git a/lldb/test/Shell/Settings/TestFrameFormatFunctionScope.test b/lldb/test/Shell/Settings/TestFrameFormatFunctionScope.test index a28c16f..f4a1766 100644 --- a/lldb/test/Shell/Settings/TestFrameFormatFunctionScope.test +++ b/lldb/test/Shell/Settings/TestFrameFormatFunctionScope.test @@ -3,11 +3,11 @@  # Test the ${function.scope} frame-format variable.  # RUN: split-file %s %t -# RUN: %clang_host -g -gdwarf %t/main.cpp -o %t.out +# RUN: %clangxx_host -g -gdwarf %t/main.cpp -o %t.out  # RUN: %lldb -x -b -s %t/commands.input %t.out -o exit 2>&1 \  # RUN:       | FileCheck %s  # -# RUN: %clang_host -O0 %t/main.cpp -o %t-nodebug.out +# RUN: %clangxx_host -O0 %t/main.cpp -o %t-nodebug.out  # RUN: %lldb -x -b -s %t/commands.input %t-nodebug.out -o exit 2>&1 \  # RUN:       | FileCheck %s diff --git a/lldb/test/Shell/Settings/TestFrameFormatFunctionSuffix.test b/lldb/test/Shell/Settings/TestFrameFormatFunctionSuffix.test index 4609a04..5883c72 100644 --- a/lldb/test/Shell/Settings/TestFrameFormatFunctionSuffix.test +++ b/lldb/test/Shell/Settings/TestFrameFormatFunctionSuffix.test @@ -3,7 +3,7 @@  # Test the ${function.suffix} frame-format variable.  # RUN: split-file %s %t -# RUN: %clang_host -g -gdwarf %t/main.cpp -o %t.out +# RUN: %clangxx_host -g -gdwarf %t/main.cpp -o %t.out  # RUN: %lldb -x -b -s %t/commands.input %t.out -o exit 2>&1 \  # RUN:       | FileCheck %s diff --git a/lldb/test/Shell/Settings/TestFrameFormatFunctionTemplateArguments.test b/lldb/test/Shell/Settings/TestFrameFormatFunctionTemplateArguments.test index ac8a328..a09a961 100644 --- a/lldb/test/Shell/Settings/TestFrameFormatFunctionTemplateArguments.test +++ b/lldb/test/Shell/Settings/TestFrameFormatFunctionTemplateArguments.test @@ -3,11 +3,11 @@  # Test the ${function.template-arguments} frame-format variable.  # RUN: split-file %s %t -# RUN: %clang_host -g -gdwarf %t/main.cpp -o %t.out +# RUN: %clangxx_host -g -gdwarf %t/main.cpp -o %t.out  # RUN: %lldb -x -b -s %t/commands.input %t.out -o exit 2>&1 \  # RUN:       | FileCheck %s  # -# RUN: %clang_host -O0 %t/main.cpp -o %t-nodebug.out +# RUN: %clangxx_host -O0 %t/main.cpp -o %t-nodebug.out  # RUN: %lldb -x -b -s %t/commands.input %t-nodebug.out -o exit 2>&1 \  # RUN:       | FileCheck %s diff --git a/lldb/test/Shell/Settings/TestFrameFunctionInlined.test b/lldb/test/Shell/Settings/TestFrameFunctionInlined.test index 5db34b4..1bb7ab4 100644 --- a/lldb/test/Shell/Settings/TestFrameFunctionInlined.test +++ b/lldb/test/Shell/Settings/TestFrameFunctionInlined.test @@ -6,7 +6,7 @@  # REQUIRES: (system-windows && lld) || !system-windows  # RUN: split-file %s %t -# RUN: %clang_host -g -gdwarf %t/main.cpp -o %t.out %if system-windows %{-fuse-ld=lld%} +# RUN: %clangxx_host -g -gdwarf %t/main.cpp -o %t.out %if system-windows %{-fuse-ld=lld%}  # RUN: %lldb -x -b -s %t/commands.input %t.out -o exit 2>&1 \  # RUN:       | FileCheck %s diff --git a/lldb/test/Shell/SymbolFile/DWARF/split-dwarf-expression-eval-bug.cpp b/lldb/test/Shell/SymbolFile/DWARF/split-dwarf-expression-eval-bug.cpp index 4a8004d..b02eea6 100644 --- a/lldb/test/Shell/SymbolFile/DWARF/split-dwarf-expression-eval-bug.cpp +++ b/lldb/test/Shell/SymbolFile/DWARF/split-dwarf-expression-eval-bug.cpp @@ -7,10 +7,10 @@  // UNSUPPORTED: system-darwin, system-windows -// RUN: %clang_host -c -gsplit-dwarf -g %s -o %t1.o -DONE -// RUN: %clang_host -c -gsplit-dwarf -g %s -o %t2.o -DTWO -// RUN: %clang_host -c -gsplit-dwarf -g %s -o %t3.o -DTHREE -// RUN: %clang_host %t1.o %t2.o %t3.o -o %t +// RUN: %clangxx_host -c -gsplit-dwarf -g %s -o %t1.o -DONE +// RUN: %clangxx_host -c -gsplit-dwarf -g %s -o %t2.o -DTWO +// RUN: %clangxx_host -c -gsplit-dwarf -g %s -o %t3.o -DTHREE +// RUN: %clangxx_host %t1.o %t2.o %t3.o -o %t  // RUN: %lldb %t -o "br set -n foo" -o run -o "expression bool_in_first_cu" -o exit \  // RUN:   | FileCheck %s diff --git a/lldb/test/Shell/SymbolFile/DWARF/x86/apple-index-is-used.cpp b/lldb/test/Shell/SymbolFile/DWARF/x86/apple-index-is-used.cpp index 5bcb2cb..8ef2e56 100644 --- a/lldb/test/Shell/SymbolFile/DWARF/x86/apple-index-is-used.cpp +++ b/lldb/test/Shell/SymbolFile/DWARF/x86/apple-index-is-used.cpp @@ -1,5 +1,5 @@  // Test that we use the apple indexes. -// RUN: %clang %s -g -c -o %t --target=x86_64-apple-macosx -gdwarf-4 +// RUN: %clangxx %s -g -c -o %t --target=x86_64-apple-macosx -gdwarf-4  // RUN: lldb-test symbols %t | FileCheck %s  // CHECK: .apple_names index present diff --git a/lldb/test/Shell/SymbolFile/DWARF/x86/debug-names-compressed.cpp b/lldb/test/Shell/SymbolFile/DWARF/x86/debug-names-compressed.cpp index 4dcbb47..53c3d3d 100644 --- a/lldb/test/Shell/SymbolFile/DWARF/x86/debug-names-compressed.cpp +++ b/lldb/test/Shell/SymbolFile/DWARF/x86/debug-names-compressed.cpp @@ -3,7 +3,7 @@  // REQUIRES: lld, zlib -// RUN: %clang -c -o %t.o --target=x86_64-pc-linux -gdwarf-5 -gpubnames %s +// RUN: %clangxx -c -o %t.o --target=x86_64-pc-linux -gdwarf-5 -gpubnames %s  // RUN: ld.lld %t.o -o %t --compress-debug-sections=zlib  // RUN: llvm-readobj --sections %t | FileCheck %s --check-prefix NAMES  // RUN: lldb-test symbols --find=variable --name=foo %t | FileCheck %s diff --git a/lldb/test/Shell/SymbolFile/DWARF/x86/debug-types-debug-names.cpp b/lldb/test/Shell/SymbolFile/DWARF/x86/debug-types-debug-names.cpp index 2b7a928c..acc34dd 100644 --- a/lldb/test/Shell/SymbolFile/DWARF/x86/debug-types-debug-names.cpp +++ b/lldb/test/Shell/SymbolFile/DWARF/x86/debug-types-debug-names.cpp @@ -6,7 +6,7 @@  // REQUIRES: lld -// RUN: %clang %s -target x86_64-pc-linux -gdwarf-5 -fdebug-types-section \ +// RUN: %clangxx %s -target x86_64-pc-linux -gdwarf-5 -fdebug-types-section \  // RUN:   -gpubnames -fno-limit-debug-info -c -o %t.o  // RUN: ld.lld %t.o -o %t  // RUN: %lldb %t -o "type lookup stype" -b | FileCheck %s --check-prefix=BASE diff --git a/lldb/test/Shell/SymbolFile/DWARF/x86/debug-types-dwo-cross-reference.cpp b/lldb/test/Shell/SymbolFile/DWARF/x86/debug-types-dwo-cross-reference.cpp index 0e29cb3..bc863fb6 100644 --- a/lldb/test/Shell/SymbolFile/DWARF/x86/debug-types-dwo-cross-reference.cpp +++ b/lldb/test/Shell/SymbolFile/DWARF/x86/debug-types-dwo-cross-reference.cpp @@ -3,9 +3,9 @@  // REQUIRES: lld -// RUN: %clang %s -target x86_64-pc-linux -fno-standalone-debug -g \ +// RUN: %clangxx %s -target x86_64-pc-linux -fno-standalone-debug -g \  // RUN:   -fdebug-types-section -gsplit-dwarf -c -o %t1.o -DONE -// RUN: %clang %s -target x86_64-pc-linux -fno-standalone-debug -g \ +// RUN: %clangxx %s -target x86_64-pc-linux -fno-standalone-debug -g \  // RUN:   -fdebug-types-section -gsplit-dwarf -c -o %t2.o -DTWO  // RUN: llvm-dwarfdump %t1.dwo -debug-types -debug-info | FileCheck --check-prefix=ONEUNIT %s  // RUN: llvm-dwarfdump %t2.dwo -debug-types -debug-info | FileCheck --check-prefix=ONEUNIT %s diff --git a/lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5-index-is-used.cpp b/lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5-index-is-used.cpp index d6ac237..2fdb1d8 100644 --- a/lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5-index-is-used.cpp +++ b/lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5-index-is-used.cpp @@ -2,7 +2,7 @@  // REQUIRES: lld -// RUN: %clang %s -c -o %t.o --target=x86_64-pc-linux -gdwarf-5 -gpubnames +// RUN: %clangxx %s -c -o %t.o --target=x86_64-pc-linux -gdwarf-5 -gpubnames  // RUN: ld.lld %t.o -o %t  // RUN: lldb-test symbols %t | FileCheck %s diff --git a/lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5-partial-index.cpp b/lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5-partial-index.cpp index ab84415..a739dfd 100644 --- a/lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5-partial-index.cpp +++ b/lldb/test/Shell/SymbolFile/DWARF/x86/dwarf5-partial-index.cpp @@ -3,9 +3,9 @@  // REQUIRES: lld -// RUN: %clang %s -c -o %t-1.o --target=x86_64-pc-linux -DONE -gdwarf-5 -gpubnames +// RUN: %clangxx %s -c -o %t-1.o --target=x86_64-pc-linux -DONE -gdwarf-5 -gpubnames  // RUN: llvm-readobj --sections %t-1.o | FileCheck %s --check-prefix NAMES -// RUN: %clang %s -c -o %t-2.o --target=x86_64-pc-linux -DTWO -gdwarf-5 -gno-pubnames +// RUN: %clangxx %s -c -o %t-2.o --target=x86_64-pc-linux -DTWO -gdwarf-5 -gno-pubnames  // RUN: ld.lld %t-1.o %t-2.o -o %t  // RUN: lldb-test symbols --find=variable --name=foo  %t | FileCheck %s diff --git a/lldb/test/Shell/SymbolFile/DWARF/x86/dwo-not-found-warning.cpp b/lldb/test/Shell/SymbolFile/DWARF/x86/dwo-not-found-warning.cpp index 929e11f..36eb299 100644 --- a/lldb/test/Shell/SymbolFile/DWARF/x86/dwo-not-found-warning.cpp +++ b/lldb/test/Shell/SymbolFile/DWARF/x86/dwo-not-found-warning.cpp @@ -1,4 +1,4 @@ -// RUN: %clang --target=x86_64-pc-linux -g -gsplit-dwarf -c %s -o %t.o +// RUN: %clangxx --target=x86_64-pc-linux -g -gsplit-dwarf -c %s -o %t.o  // RUN: rm %t.dwo  // RUN: %lldb %t.o -o "br set -n main" -o exit 2>&1 | FileCheck %s diff --git a/lldb/test/Shell/SymbolFile/DWARF/x86/dwp-foreign-type-units.cpp b/lldb/test/Shell/SymbolFile/DWARF/x86/dwp-foreign-type-units.cpp index 9251930..7fbc4f9 100644 --- a/lldb/test/Shell/SymbolFile/DWARF/x86/dwp-foreign-type-units.cpp +++ b/lldb/test/Shell/SymbolFile/DWARF/x86/dwp-foreign-type-units.cpp @@ -16,9 +16,9 @@  // type unit comes from by looking at the DW_AT_dwo_name attribute in the  // DW_TAG_type_unit. -// RUN: %clang -target x86_64-pc-linux -gdwarf-5 -gsplit-dwarf \ +// RUN: %clangxx -target x86_64-pc-linux -gdwarf-5 -gsplit-dwarf \  // RUN:   -fdebug-types-section -gpubnames -c %s -o %t.main.o -// RUN: %clang -target x86_64-pc-linux -gdwarf-5 -gsplit-dwarf -DVARIANT \ +// RUN: %clangxx -target x86_64-pc-linux -gdwarf-5 -gsplit-dwarf -DVARIANT \  // RUN:   -fdebug-types-section -gpubnames -c %s -o %t.foo.o  // RUN: ld.lld %t.main.o %t.foo.o -o %t diff --git a/lldb/test/Shell/SymbolFile/DWARF/x86/dwp-index-cache.cpp b/lldb/test/Shell/SymbolFile/DWARF/x86/dwp-index-cache.cpp index 3e97c3f..3edcd8f 100644 --- a/lldb/test/Shell/SymbolFile/DWARF/x86/dwp-index-cache.cpp +++ b/lldb/test/Shell/SymbolFile/DWARF/x86/dwp-index-cache.cpp @@ -14,8 +14,8 @@  // complete DWARF index.  // Test that if we don't have .debug_names, that we save a full DWARF index. -// RUN: %clang -target x86_64-pc-linux -gsplit-dwarf -gdwarf-5 -DMAIN=1 -c %s -o %t.main.o -// RUN: %clang -target x86_64-pc-linux -gsplit-dwarf -gdwarf-5 -DMAIN=0 -c %s -o %t.foo.o +// RUN: %clangxx -target x86_64-pc-linux -gsplit-dwarf -gdwarf-5 -DMAIN=1 -c %s -o %t.main.o +// RUN: %clangxx -target x86_64-pc-linux -gsplit-dwarf -gdwarf-5 -DMAIN=0 -c %s -o %t.foo.o  // RUN: ld.lld %t.main.o %t.foo.o -o %t.nonames  // RUN: llvm-dwp %t.main.dwo %t.foo.dwo -o %t.nonames.dwp  // RUN: rm %t.main.dwo %t.foo.dwo @@ -35,8 +35,8 @@  // Test that if we have one .o file with .debug_names and one without, that we  // save a partial DWARF index. -// RUN: %clang -target x86_64-pc-linux -gsplit-dwarf -gdwarf-5 -DMAIN=1 -c %s -o %t.main.o -gpubnames -// RUN: %clang -target x86_64-pc-linux -gsplit-dwarf -gdwarf-5 -DMAIN=0 -c %s -o %t.foo.o +// RUN: %clangxx -target x86_64-pc-linux -gsplit-dwarf -gdwarf-5 -DMAIN=1 -c %s -o %t.main.o -gpubnames +// RUN: %clangxx -target x86_64-pc-linux -gsplit-dwarf -gdwarf-5 -DMAIN=0 -c %s -o %t.foo.o  // RUN: ld.lld %t.main.o %t.foo.o -o %t.somenames  // RUN: llvm-dwp %t.main.dwo %t.foo.dwo -o %t.somenames.dwp  // RUN: rm %t.main.dwo %t.foo.dwo diff --git a/lldb/test/Shell/SymbolFile/DWARF/x86/dwp-separate-debug-file.cpp b/lldb/test/Shell/SymbolFile/DWARF/x86/dwp-separate-debug-file.cpp index 888e96b..f625fda 100644 --- a/lldb/test/Shell/SymbolFile/DWARF/x86/dwp-separate-debug-file.cpp +++ b/lldb/test/Shell/SymbolFile/DWARF/x86/dwp-separate-debug-file.cpp @@ -1,7 +1,7 @@  // REQUIRES: lld, python  // Now test with DWARF5 -// RUN: %clang -target x86_64-pc-linux -gsplit-dwarf -gdwarf-5 -c %s -o %t.dwarf5.o +// RUN: %clangxx -target x86_64-pc-linux -gsplit-dwarf -gdwarf-5 -c %s -o %t.dwarf5.o  // RUN: ld.lld %t.dwarf5.o -o %t.dwarf5  // RUN: llvm-dwp %t.dwarf5.dwo -o %t.dwarf5.dwp  // RUN: rm %t.dwarf5.dwo @@ -64,7 +64,7 @@  // RUN:   -b %t.dwarf5.debug 2>&1 | FileCheck %s -check-prefix=NODWP  // Now test with DWARF4 -// RUN: %clang -target x86_64-pc-linux -gsplit-dwarf -gdwarf-4 -c %s -o %t.dwarf4.o +// RUN: %clangxx -target x86_64-pc-linux -gsplit-dwarf -gdwarf-4 -c %s -o %t.dwarf4.o  // RUN: ld.lld %t.dwarf4.o -o %t.dwarf4  // RUN: llvm-dwp %t.dwarf4.dwo -o %t.dwarf4.dwp  // RUN: rm %t.dwarf4.dwo @@ -128,7 +128,7 @@  // Test if we have a GNU build ID in our main executable and in our debug file,  // and we have a .dwp file that doesn't, that we can still load our .dwp file. -// RUN: %clang -target x86_64-pc-linux -gsplit-dwarf -gdwarf-5 -c %s -o %t.o +// RUN: %clangxx -target x86_64-pc-linux -gsplit-dwarf -gdwarf-5 -c %s -o %t.o  // RUN: ld.lld %t.o --build-id=md5 -o %t  // RUN: llvm-dwp %t.dwo -o %t.dwp  // RUN: rm %t.dwo diff --git a/lldb/test/Shell/SymbolFile/DWARF/x86/find-basic-function.cpp b/lldb/test/Shell/SymbolFile/DWARF/x86/find-basic-function.cpp index c42f9fe..a00b2bd 100644 --- a/lldb/test/Shell/SymbolFile/DWARF/x86/find-basic-function.cpp +++ b/lldb/test/Shell/SymbolFile/DWARF/x86/find-basic-function.cpp @@ -1,6 +1,6 @@  // REQUIRES: lld -// RUN: %clang %s -g -c -o %t.o --target=x86_64-pc-linux -gno-pubnames +// RUN: %clangxx %s -g -c -o %t.o --target=x86_64-pc-linux -gno-pubnames  // RUN: ld.lld %t.o -o %t  // RUN: lldb-test symbols --name=foo --find=function --function-flags=base %t | \  // RUN:   FileCheck --check-prefix=BASE %s @@ -19,7 +19,7 @@  // RUN: lldb-test symbols --name=not_there --find=function %t | \  // RUN:   FileCheck --check-prefix=EMPTY %s  // -// RUN: %clang %s -g -c -o %t --target=x86_64-apple-macosx +// RUN: %clangxx %s -g -c -o %t --target=x86_64-apple-macosx  // RUN: lldb-test symbols --name=foo --find=function --function-flags=base %t | \  // RUN:   FileCheck --check-prefix=BASE %s  // RUN: lldb-test symbols --name=foo --find=function --function-flags=method %t | \ @@ -39,7 +39,7 @@  // RUN: lldb-test symbols --name=not_there --find=function %t | \  // RUN:   FileCheck --check-prefix=EMPTY %s -// RUN: %clang %s -c -o %t.o --target=x86_64-pc-linux -gdwarf-5 -gpubnames +// RUN: %clangxx %s -c -o %t.o --target=x86_64-pc-linux -gdwarf-5 -gpubnames  // RUN: ld.lld %t.o -o %t  // RUN: llvm-readobj --sections %t | FileCheck %s --check-prefix NAMES  // RUN: lldb-test symbols --name=foo --find=function --function-flags=base %t | \ diff --git a/lldb/test/Shell/SymbolFile/DWARF/x86/find-basic-namespace.cpp b/lldb/test/Shell/SymbolFile/DWARF/x86/find-basic-namespace.cpp index 13d50af..14c73c3 100644 --- a/lldb/test/Shell/SymbolFile/DWARF/x86/find-basic-namespace.cpp +++ b/lldb/test/Shell/SymbolFile/DWARF/x86/find-basic-namespace.cpp @@ -1,6 +1,6 @@  // REQUIRES: lld -// RUN: %clang %s -g -c -o %t.o --target=x86_64-pc-linux -gno-pubnames +// RUN: %clangxx %s -g -c -o %t.o --target=x86_64-pc-linux -gno-pubnames  // RUN: ld.lld %t.o -o %t  // RUN: lldb-test symbols --name=foo --find=namespace %t | \  // RUN:   FileCheck --check-prefix=FOO %s @@ -9,7 +9,7 @@  // RUN: lldb-test symbols --name=not_there --find=namespace %t | \  // RUN:   FileCheck --check-prefix=EMPTY %s  // -// RUN: %clang %s -g -c -o %t --target=x86_64-apple-macosx +// RUN: %clangxx %s -g -c -o %t --target=x86_64-apple-macosx  // RUN: lldb-test symbols --name=foo --find=namespace %t | \  // RUN:   FileCheck --check-prefix=FOO %s  // RUN: lldb-test symbols --name=foo --find=namespace --context=context %t | \ @@ -17,7 +17,7 @@  // RUN: lldb-test symbols --name=not_there --find=namespace %t | \  // RUN:   FileCheck --check-prefix=EMPTY %s -// RUN: %clang %s -c -o %t.o --target=x86_64-pc-linux -gdwarf-5 -gpubnames +// RUN: %clangxx %s -c -o %t.o --target=x86_64-pc-linux -gdwarf-5 -gpubnames  // RUN: ld.lld %t.o -o %t  // RUN: llvm-readobj --sections %t | FileCheck %s --check-prefix NAMES  // RUN: lldb-test symbols --name=foo --find=namespace %t | \ diff --git a/lldb/test/Shell/SymbolFile/DWARF/x86/find-basic-type.cpp b/lldb/test/Shell/SymbolFile/DWARF/x86/find-basic-type.cpp index af49206..315fab34 100644 --- a/lldb/test/Shell/SymbolFile/DWARF/x86/find-basic-type.cpp +++ b/lldb/test/Shell/SymbolFile/DWARF/x86/find-basic-type.cpp @@ -1,6 +1,6 @@  // REQUIRES: lld -// RUN: %clang %s -g -c -o %t.o --target=x86_64-pc-linux -gno-pubnames +// RUN: %clangxx %s -g -c -o %t.o --target=x86_64-pc-linux -gno-pubnames  // RUN: ld.lld %t.o -o %t  // RUN: lldb-test symbols --name=foo --find=type %t | \  // RUN:   FileCheck --check-prefix=NAME %s @@ -11,7 +11,7 @@  // RUN: lldb-test symbols --name=not_there --find=type %t | \  // RUN:   FileCheck --check-prefix=EMPTY %s  // -// RUN: %clang %s -g -c -o %t --target=x86_64-apple-macosx +// RUN: %clangxx %s -g -c -o %t --target=x86_64-apple-macosx  // RUN: lldb-test symbols --name=foo --find=type %t | \  // RUN:   FileCheck --check-prefix=NAME %s  // RUN: lldb-test symbols --name=::foo --find=type %t | \ @@ -21,7 +21,7 @@  // RUN: lldb-test symbols --name=not_there --find=type %t | \  // RUN:   FileCheck --check-prefix=EMPTY %s -// RUN: %clang %s -c -o %t.o --target=x86_64-pc-linux -gdwarf-5 -gpubnames +// RUN: %clangxx %s -c -o %t.o --target=x86_64-pc-linux -gdwarf-5 -gpubnames  // RUN: ld.lld %t.o -o %t  // RUN: llvm-readobj --sections %t | FileCheck %s --check-prefix NAMES  // RUN: lldb-test symbols --name=foo --find=type %t | \ diff --git a/lldb/test/Shell/SymbolFile/DWARF/x86/find-basic-variable.cpp b/lldb/test/Shell/SymbolFile/DWARF/x86/find-basic-variable.cpp index e46fa14..b6e2252 100644 --- a/lldb/test/Shell/SymbolFile/DWARF/x86/find-basic-variable.cpp +++ b/lldb/test/Shell/SymbolFile/DWARF/x86/find-basic-variable.cpp @@ -1,6 +1,6 @@  // REQUIRES: lld -// RUN: %clang %s -g -c -o %t.o --target=x86_64-pc-linux -gno-pubnames +// RUN: %clangxx %s -g -c -o %t.o --target=x86_64-pc-linux -gno-pubnames  // RUN: ld.lld %t.o -o %t  // RUN: lldb-test symbols --name=foo --find=variable --context=context %t | \  // RUN:   FileCheck --check-prefix=CONTEXT %s @@ -11,7 +11,7 @@  // RUN: lldb-test symbols --name=not_there --find=variable %t | \  // RUN:   FileCheck --check-prefix=EMPTY %s  // -// RUN: %clang %s -g -c -o %t --target=x86_64-apple-macosx +// RUN: %clangxx %s -g -c -o %t --target=x86_64-apple-macosx  // RUN: lldb-test symbols --name=foo --find=variable --context=context %t | \  // RUN:   FileCheck --check-prefix=CONTEXT %s  // RUN: lldb-test symbols --name=foo --find=variable %t | \ @@ -21,7 +21,7 @@  // RUN: lldb-test symbols --name=not_there --find=variable %t | \  // RUN:   FileCheck --check-prefix=EMPTY %s  // -// RUN: %clang %s -g -c -o %t.o --target=x86_64-pc-linux -gdwarf-5 -gpubnames +// RUN: %clangxx %s -g -c -o %t.o --target=x86_64-pc-linux -gdwarf-5 -gpubnames  // RUN: ld.lld %t.o -o %t  // RUN: llvm-readobj --sections %t | FileCheck %s --check-prefix NAMES  // RUN: lldb-test symbols --name=foo --find=variable --context=context %t | \ diff --git a/lldb/test/Shell/SymbolFile/DWARF/x86/find-function-regex.cpp b/lldb/test/Shell/SymbolFile/DWARF/x86/find-function-regex.cpp index be26759..5c7ad84 100644 --- a/lldb/test/Shell/SymbolFile/DWARF/x86/find-function-regex.cpp +++ b/lldb/test/Shell/SymbolFile/DWARF/x86/find-function-regex.cpp @@ -1,13 +1,13 @@  // REQUIRES: lld -// RUN: %clang %s -g -c -o %t.o --target=x86_64-pc-linux -gno-pubnames +// RUN: %clangxx %s -g -c -o %t.o --target=x86_64-pc-linux -gno-pubnames  // RUN: ld.lld %t.o -o %t  // RUN: lldb-test symbols --name=f.o --regex --find=function %t | FileCheck %s  // -// RUN: %clang %s -g -c -o %t --target=x86_64-apple-macosx +// RUN: %clangxx %s -g -c -o %t --target=x86_64-apple-macosx  // RUN: lldb-test symbols --name=f.o --regex --find=function %t | FileCheck %s -// RUN: %clang %s -g -c -o %t.o --target=x86_64-pc-linux -gdwarf-5 -gpubnames +// RUN: %clangxx %s -g -c -o %t.o --target=x86_64-pc-linux -gdwarf-5 -gpubnames  // RUN: ld.lld %t.o -o %t  // RUN: llvm-readobj --sections %t | FileCheck %s --check-prefix NAMES  // RUN: lldb-test symbols --name=f.o --regex --find=function %t | FileCheck %s diff --git a/lldb/test/Shell/SymbolFile/DWARF/x86/find-method-local-struct.cpp b/lldb/test/Shell/SymbolFile/DWARF/x86/find-method-local-struct.cpp index 3da4a4a..46553a8 100644 --- a/lldb/test/Shell/SymbolFile/DWARF/x86/find-method-local-struct.cpp +++ b/lldb/test/Shell/SymbolFile/DWARF/x86/find-method-local-struct.cpp @@ -1,4 +1,4 @@ -// RUN: %clang %s -g -c -o %t --target=x86_64-apple-macosx +// RUN: %clangxx %s -g -c -o %t --target=x86_64-apple-macosx  // RUN: lldb-test symbols --name=foo --find=function --function-flags=method %t | \  // RUN:   FileCheck %s diff --git a/lldb/test/Shell/SymbolFile/DWARF/x86/find-method.cpp b/lldb/test/Shell/SymbolFile/DWARF/x86/find-method.cpp index 9f8b3df..26faf89 100644 --- a/lldb/test/Shell/SymbolFile/DWARF/x86/find-method.cpp +++ b/lldb/test/Shell/SymbolFile/DWARF/x86/find-method.cpp @@ -1,15 +1,15 @@  // REQUIRES: lld -// RUN: %clang %s -g -c -o %t.o --target=x86_64-pc-linux -gno-pubnames +// RUN: %clangxx %s -g -c -o %t.o --target=x86_64-pc-linux -gno-pubnames  // RUN: ld.lld %t.o -o %t  // RUN: lldb-test symbols --name=foo --find=function --function-flags=method %t | \  // RUN:   FileCheck %s  // -// RUN: %clang %s -g -c -o %t --target=x86_64-apple-macosx +// RUN: %clangxx %s -g -c -o %t --target=x86_64-apple-macosx  // RUN: lldb-test symbols --name=foo --find=function --function-flags=method %t | \  // RUN:   FileCheck %s -// RUN: %clang %s -c -o %t.o --target=x86_64-pc-linux -gdwarf-5 -gpubnames +// RUN: %clangxx %s -c -o %t.o --target=x86_64-pc-linux -gdwarf-5 -gpubnames  // RUN: ld.lld %t.o -o %t  // RUN: llvm-readobj --sections %t | FileCheck %s --check-prefix NAMES  // RUN: lldb-test symbols --name=foo --find=function --function-flags=method %t | \ diff --git a/lldb/test/Shell/SymbolFile/DWARF/x86/find-qualified-variable.cpp b/lldb/test/Shell/SymbolFile/DWARF/x86/find-qualified-variable.cpp index 1ad3e7f..e3f9ce3 100644 --- a/lldb/test/Shell/SymbolFile/DWARF/x86/find-qualified-variable.cpp +++ b/lldb/test/Shell/SymbolFile/DWARF/x86/find-qualified-variable.cpp @@ -1,4 +1,4 @@ -// RUN: %clang %s -g -c -o %t --target=x86_64-apple-macosx +// RUN: %clangxx %s -g -c -o %t --target=x86_64-apple-macosx  // RUN: lldb-test symbols --name=A::foo --find=variable %t | FileCheck %s  // CHECK: Found 1 variables: diff --git a/lldb/test/Shell/SymbolFile/DWARF/x86/find-variable-dwo.cpp b/lldb/test/Shell/SymbolFile/DWARF/x86/find-variable-dwo.cpp index b5d35e4..250b343 100644 --- a/lldb/test/Shell/SymbolFile/DWARF/x86/find-variable-dwo.cpp +++ b/lldb/test/Shell/SymbolFile/DWARF/x86/find-variable-dwo.cpp @@ -1,9 +1,9 @@  // REQUIRES: lld -// RUN: %clang %s -gdwarf-5 -gpubnames -gsplit-dwarf -c -emit-llvm -o - --target=x86_64-pc-linux -DONE | \ +// RUN: %clangxx %s -gdwarf-5 -gpubnames -gsplit-dwarf -c -emit-llvm -o - --target=x86_64-pc-linux -DONE | \  // RUN:   llc -filetype=obj -split-dwarf-file=%t-1.dwo -o %t-1.o  // RUN: llvm-objcopy --split-dwo=%t-1.dwo %t-1.o -// RUN: %clang %s -gdwarf-5 -gpubnames -gsplit-dwarf -c -emit-llvm -o - --target=x86_64-pc-linux -DTWO | \ +// RUN: %clangxx %s -gdwarf-5 -gpubnames -gsplit-dwarf -c -emit-llvm -o - --target=x86_64-pc-linux -DTWO | \  // RUN:   llc -filetype=obj -split-dwarf-file=%t-2.dwo -o %t-2.o  // RUN: llvm-objcopy --split-dwo=%t-2.dwo %t-2.o  // RUN: ld.lld %t-1.o %t-2.o -o %t diff --git a/lldb/test/Shell/SymbolFile/DWARF/x86/find-variable-file.cpp b/lldb/test/Shell/SymbolFile/DWARF/x86/find-variable-file.cpp index f1a9a4e..3a8cf89 100644 --- a/lldb/test/Shell/SymbolFile/DWARF/x86/find-variable-file.cpp +++ b/lldb/test/Shell/SymbolFile/DWARF/x86/find-variable-file.cpp @@ -1,7 +1,7 @@  // REQUIRES: lld -// RUN: %clang -g -c -o %t-1.o --target=x86_64-pc-linux -gno-pubnames %s -// RUN: %clang -g -c -o %t-2.o --target=x86_64-pc-linux -gno-pubnames %S/Inputs/find-variable-file-2.cpp +// RUN: %clangxx -g -c -o %t-1.o --target=x86_64-pc-linux -gno-pubnames %s +// RUN: %clangxx -g -c -o %t-2.o --target=x86_64-pc-linux -gno-pubnames %S/Inputs/find-variable-file-2.cpp  // RUN: ld.lld %t-1.o %t-2.o -o %t  // RUN: lldb-test symbols --file=find-variable-file.cpp --find=variable %t | \  // RUN:   FileCheck --check-prefix=ONE %s @@ -10,16 +10,16 @@  // Run the same test with split-dwarf. This is interesting because the two  // split compile units will have the same offset (0). -// RUN: %clang -g -c -o %t-1.o --target=x86_64-pc-linux -gsplit-dwarf %s -// RUN: %clang -g -c -o %t-2.o --target=x86_64-pc-linux -gsplit-dwarf %S/Inputs/find-variable-file-2.cpp +// RUN: %clangxx -g -c -o %t-1.o --target=x86_64-pc-linux -gsplit-dwarf %s +// RUN: %clangxx -g -c -o %t-2.o --target=x86_64-pc-linux -gsplit-dwarf %S/Inputs/find-variable-file-2.cpp  // RUN: ld.lld %t-1.o %t-2.o -o %t  // RUN: lldb-test symbols --file=find-variable-file.cpp --find=variable %t | \  // RUN:   FileCheck --check-prefix=ONE %s  // RUN: lldb-test symbols --file=find-variable-file-2.cpp --find=variable %t | \  // RUN:   FileCheck --check-prefix=TWO %s -// RUN: %clang -c -o %t-1.o --target=x86_64-pc-linux -gdwarf-5 -gpubnames %s -// RUN: %clang -c -o %t-2.o --target=x86_64-pc-linux -gdwarf-5 -gpubnames %S/Inputs/find-variable-file-2.cpp +// RUN: %clangxx -c -o %t-1.o --target=x86_64-pc-linux -gdwarf-5 -gpubnames %s +// RUN: %clangxx -c -o %t-2.o --target=x86_64-pc-linux -gdwarf-5 -gpubnames %S/Inputs/find-variable-file-2.cpp  // RUN: ld.lld %t-1.o %t-2.o -o %t  // RUN: llvm-readobj --sections %t | FileCheck %s --check-prefix NAMES  // RUN: lldb-test symbols --file=find-variable-file.cpp --find=variable %t | \ @@ -29,9 +29,9 @@  // Run the same test with split dwarf and pubnames to check whether we can find  // the compile unit using the name index if it is split. -// RUN: %clang -c -o %t-1.o --target=x86_64-pc-linux -gdwarf-5 -gsplit-dwarf -gpubnames %s -// RUN: %clang -c -o %t-2.o --target=x86_64-pc-linux -gdwarf-5 -gsplit-dwarf -gpubnames %S/Inputs/find-variable-file-2.cpp -// RUN: %clang -c -o %t-3.o --target=x86_64-pc-linux -gdwarf-5 -gsplit-dwarf -gpubnames %S/Inputs/find-variable-file-3.cpp +// RUN: %clangxx -c -o %t-1.o --target=x86_64-pc-linux -gdwarf-5 -gsplit-dwarf -gpubnames %s +// RUN: %clangxx -c -o %t-2.o --target=x86_64-pc-linux -gdwarf-5 -gsplit-dwarf -gpubnames %S/Inputs/find-variable-file-2.cpp +// RUN: %clangxx -c -o %t-3.o --target=x86_64-pc-linux -gdwarf-5 -gsplit-dwarf -gpubnames %S/Inputs/find-variable-file-3.cpp  // RUN: ld.lld %t-1.o %t-2.o %t-3.o -o %t  // RUN: llvm-readobj --sections %t | FileCheck %s --check-prefix NAMES  // RUN: lldb-test symbols --file=find-variable-file.cpp --find=variable %t | \ diff --git a/lldb/test/Shell/SymbolFile/DWARF/x86/member-pointers.cpp b/lldb/test/Shell/SymbolFile/DWARF/x86/member-pointers.cpp index a128923..0080577 100644 --- a/lldb/test/Shell/SymbolFile/DWARF/x86/member-pointers.cpp +++ b/lldb/test/Shell/SymbolFile/DWARF/x86/member-pointers.cpp @@ -1,7 +1,7 @@  // REQUIRES: lld
  // Itanium ABI:
 -// RUN: %clang --target=x86_64-pc-linux -gdwarf -c -o %t_linux.o %s
 +// RUN: %clangxx --target=x86_64-pc-linux -gdwarf -c -o %t_linux.o %s
  // RUN: %lldb -f %t_linux.o -b -o "target variable s1 s2 m1 m2 v1 v2 v3 v4" | FileCheck --check-prefix=CHECK-GNU %s
  //
  // CHECK-GNU: (void (Single1::*)()) s1 = 0x00000000000000000000000000000000
 diff --git a/lldb/test/Shell/SymbolFile/DWARF/x86/module-ownership.mm b/lldb/test/Shell/SymbolFile/DWARF/x86/module-ownership.mm index 2dec109..27aa136 100644 --- a/lldb/test/Shell/SymbolFile/DWARF/x86/module-ownership.mm +++ b/lldb/test/Shell/SymbolFile/DWARF/x86/module-ownership.mm @@ -1,5 +1,5 @@  // RUN: rm -rf %t.cache -// RUN: %clang --target=x86_64-apple-macosx -g -gmodules -Wno-objc-root-class \ +// RUN: %clangxx --target=x86_64-apple-macosx -g -gmodules -Wno-objc-root-class \  // RUN:    -fmodules -fmodules-cache-path=%t.cache \  // RUN:    -c -o %t.o %s -I%S/Inputs  // RUN: lldb-test symbols -dump-clang-ast %t.o | FileCheck --check-prefix CHECK-ANON-S1 %s diff --git a/lldb/test/Shell/SymbolFile/DWARF/x86/no_unique_address-with-bitfields.cpp b/lldb/test/Shell/SymbolFile/DWARF/x86/no_unique_address-with-bitfields.cpp index 297fb82..8f530c8 100644 --- a/lldb/test/Shell/SymbolFile/DWARF/x86/no_unique_address-with-bitfields.cpp +++ b/lldb/test/Shell/SymbolFile/DWARF/x86/no_unique_address-with-bitfields.cpp @@ -1,4 +1,4 @@ -// RUN: %clang --target=x86_64-apple-macosx -c -gdwarf -o %t %s +// RUN: %clangxx --target=x86_64-apple-macosx -c -gdwarf -o %t %s  // RUN: %lldb %t \  // RUN:   -o "target var global" \  // RUN:   -o "target var global2" \ diff --git a/lldb/test/Shell/SymbolFile/DWARF/x86/type-definition-search.cpp b/lldb/test/Shell/SymbolFile/DWARF/x86/type-definition-search.cpp index 5a40a6e..5ab45ee 100644 --- a/lldb/test/Shell/SymbolFile/DWARF/x86/type-definition-search.cpp +++ b/lldb/test/Shell/SymbolFile/DWARF/x86/type-definition-search.cpp @@ -4,18 +4,18 @@  // REQUIRES: lld -// RUN: %clang --target=x86_64-pc-linux -c %s -o %t-n-a.o -g -gsimple-template-names -DFILE_A -// RUN: %clang --target=x86_64-pc-linux -c %s -o %t-n-b.o -g -gsimple-template-names -DFILE_B +// RUN: %clangxx --target=x86_64-pc-linux -c %s -o %t-n-a.o -g -gsimple-template-names -DFILE_A +// RUN: %clangxx --target=x86_64-pc-linux -c %s -o %t-n-b.o -g -gsimple-template-names -DFILE_B  // RUN: ld.lld %t-n-a.o %t-n-b.o -o %t-n  // RUN: %lldb %t-n -o "target variable --ptr-depth 1 --show-types both_a both_b" -o exit | FileCheck %s -// RUN: %clang --target=x86_64-pc-linux -c %s -o %t-t-a.o -g -fdebug-types-section -DFILE_A -// RUN: %clang --target=x86_64-pc-linux -c %s -o %t-t-b.o -g -fdebug-types-section -DFILE_B +// RUN: %clangxx --target=x86_64-pc-linux -c %s -o %t-t-a.o -g -fdebug-types-section -DFILE_A +// RUN: %clangxx --target=x86_64-pc-linux -c %s -o %t-t-b.o -g -fdebug-types-section -DFILE_B  // RUN: ld.lld %t-t-a.o %t-t-b.o -o %t-t  // RUN: %lldb %t-t -o "target variable --ptr-depth 1 --show-types both_a both_b" -o exit | FileCheck %s -// RUN: %clang --target=x86_64-pc-linux -c %s -o %t-tn-a.o -g -fdebug-types-section -gsimple-template-names -DFILE_A -// RUN: %clang --target=x86_64-pc-linux -c %s -o %t-tn-b.o -g -fdebug-types-section -gsimple-template-names -DFILE_B +// RUN: %clangxx --target=x86_64-pc-linux -c %s -o %t-tn-a.o -g -fdebug-types-section -gsimple-template-names -DFILE_A +// RUN: %clangxx --target=x86_64-pc-linux -c %s -o %t-tn-b.o -g -fdebug-types-section -gsimple-template-names -DFILE_B  // RUN: ld.lld %t-tn-a.o %t-tn-b.o -o %t-tn  // RUN: %lldb %t-tn -o "target variable --ptr-depth 1 --show-types both_a both_b" -o exit | FileCheck %s diff --git a/lldb/test/Shell/SymbolFile/DWARF/x86/type-unit-same-basename.cpp b/lldb/test/Shell/SymbolFile/DWARF/x86/type-unit-same-basename.cpp index f7f5a30..f9fd5b5 100644 --- a/lldb/test/Shell/SymbolFile/DWARF/x86/type-unit-same-basename.cpp +++ b/lldb/test/Shell/SymbolFile/DWARF/x86/type-unit-same-basename.cpp @@ -5,8 +5,8 @@  // REQUIRES: lld -// RUN: %clang --target=x86_64-pc-linux -c %s -o %t-a.o -g -fdebug-types-section -flimit-debug-info -DFILE_A -// RUN: %clang --target=x86_64-pc-linux -c %s -o %t-b.o -g -fdebug-types-section -flimit-debug-info -DFILE_B +// RUN: %clangxx --target=x86_64-pc-linux -c %s -o %t-a.o -g -fdebug-types-section -flimit-debug-info -DFILE_A +// RUN: %clangxx --target=x86_64-pc-linux -c %s -o %t-b.o -g -fdebug-types-section -flimit-debug-info -DFILE_B  // RUN: ld.lld -z undefs %t-a.o %t-b.o -o %t  // RUN: %lldb %t -o "target variable x" -o exit | FileCheck %s diff --git a/lldb/test/Shell/SymbolFile/NativePDB/native-setting.cpp b/lldb/test/Shell/SymbolFile/NativePDB/native-setting.cpp index dc26ec8..91f451f 100644 --- a/lldb/test/Shell/SymbolFile/NativePDB/native-setting.cpp +++ b/lldb/test/Shell/SymbolFile/NativePDB/native-setting.cpp @@ -8,9 +8,9 @@  // RUN: env LLDB_USE_NATIVE_PDB_READER=0 %lldb %t.exe -o 'target modules dump symfile' 2>&1 | FileCheck --check-prefix=ENV0 %s  // RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb %t.exe -o 'target modules dump symfile' 2>&1 | FileCheck --check-prefix=ENV1 %s -// RUN: env LLDB_USE_NATIVE_PDB_READER=foo %lldb %t.exe -o 'target modules dump symfile' 2>&1 | FileCheck --check-prefix=ENV0 %s -// RUN: env LLDB_USE_NATIVE_PDB_READER=42 %lldb %t.exe -o 'target modules dump symfile' 2>&1 | FileCheck --check-prefix=ENV0 %s -// RUN: env LLDB_USE_NATIVE_PDB_READER=-1 %lldb %t.exe -o 'target modules dump symfile' 2>&1 | FileCheck --check-prefix=ENV0 %s +// RUN: env LLDB_USE_NATIVE_PDB_READER=foo %lldb %t.exe -o 'target modules dump symfile' 2>&1 | FileCheck --check-prefix=ENV1 %s +// RUN: env LLDB_USE_NATIVE_PDB_READER=42 %lldb %t.exe -o 'target modules dump symfile' 2>&1 | FileCheck --check-prefix=ENV1 %s +// RUN: env LLDB_USE_NATIVE_PDB_READER=-1 %lldb %t.exe -o 'target modules dump symfile' 2>&1 | FileCheck --check-prefix=ENV1 %s  // RUN: env LLDB_USE_NATIVE_PDB_READER=0 %lldb \  // RUN:     -o 'settings set plugin.symbol-file.pdb.reader dia' \ diff --git a/lldb/test/Shell/SymbolFile/NativePDB/symtab.cpp b/lldb/test/Shell/SymbolFile/NativePDB/symtab.cpp index beb5ae2..75c59c5 100644 --- a/lldb/test/Shell/SymbolFile/NativePDB/symtab.cpp +++ b/lldb/test/Shell/SymbolFile/NativePDB/symtab.cpp @@ -42,18 +42,18 @@ int main(int argc, char **argv) {    return ns::a_function() + b.b_func();  } -// CHECK-DAG: Code {{.*}} main -// CHECK-DAG: Code {{.*}} ?b_func@?$B@F@ns@@QEBAHXZ -// CHECK-DAG: Code {{.*}} ?something@A@@QEAAXXZ -// CHECK-DAG: Code {{.*}} ??_GDyn@ns@@UEAAPEAXI@Z -// CHECK-DAG: Code {{.*}} ??2@YAPEAX_K@Z -// CHECK-DAG: Code {{.*}} ??3@YAXPEAX_K@Z -// CHECK-DAG: Code {{.*}} ?static_fn@C@?$B@H@ns@@SAHXZ -// CHECK-DAG: Code {{.*}} ?a_function@ns@@YAHXZ -// CHECK-DAG: Code {{.*}} ?static_fn@C@?$B@_N@ns@@SAHXZ -// CHECK-DAG: Code {{.*}} ??1Dyn@ns@@UEAA@XZ -// CHECK-DAG: Code {{.*}} ??0Dyn@ns@@QEAA@XZ -// CHECK-DAG: Data {{.*}} ?global_int@@3HA -// CHECK-DAG: Data {{.*}} ??_7Dyn@ns@@6B@ -// CHECK-DAG: Data {{.*}} ?global_a@@3UA@@A -// CHECK-DAG: Data {{.*}} ?global_c@@3UC@?$B@_J@ns@@A +// CHECK-DAG: Code 0x{{[0-9a-f]+}} 0x{{0*[1-9a-f][0-9a-f]*}} 0x00000000 main +// CHECK-DAG: Code 0x{{[0-9a-f]+}} 0x{{0*[1-9a-f][0-9a-f]*}} 0x00000000 ?b_func@?$B@F@ns@@QEBAHXZ +// CHECK-DAG: Code 0x{{[0-9a-f]+}} 0x{{0*[1-9a-f][0-9a-f]*}} 0x00000000 ?something@A@@QEAAXXZ +// CHECK-DAG: Code 0x{{[0-9a-f]+}} 0x{{0*[1-9a-f][0-9a-f]*}} 0x00000000 ??_GDyn@ns@@UEAAPEAXI@Z +// CHECK-DAG: Code 0x{{[0-9a-f]+}} 0x{{0*[1-9a-f][0-9a-f]*}} 0x00000000 ??2@YAPEAX_K@Z +// CHECK-DAG: Code 0x{{[0-9a-f]+}} 0x{{0*[1-9a-f][0-9a-f]*}} 0x00000000 ??3@YAXPEAX_K@Z +// CHECK-DAG: Code 0x{{[0-9a-f]+}} 0x{{0*[1-9a-f][0-9a-f]*}} 0x00000000 ?static_fn@C@?$B@H@ns@@SAHXZ +// CHECK-DAG: Code 0x{{[0-9a-f]+}} 0x{{0*[1-9a-f][0-9a-f]*}} 0x00000000 ?a_function@ns@@YAHXZ +// CHECK-DAG: Code 0x{{[0-9a-f]+}} 0x{{0*[1-9a-f][0-9a-f]*}} 0x00000000 ?static_fn@C@?$B@_N@ns@@SAHXZ +// CHECK-DAG: Code 0x{{[0-9a-f]+}} 0x{{0*[1-9a-f][0-9a-f]*}} 0x00000000 ??1Dyn@ns@@UEAA@XZ +// CHECK-DAG: Code 0x{{[0-9a-f]+}} 0x{{0*[1-9a-f][0-9a-f]*}} 0x00000000 ??0Dyn@ns@@QEAA@XZ +// CHECK-DAG: Data 0x{{[0-9a-f]+}} 0x{{0*[1-9a-f][0-9a-f]*}} 0x00000000 ?global_int@@3HA +// CHECK-DAG: Data 0x{{[0-9a-f]+}} 0x{{0*[1-9a-f][0-9a-f]*}} 0x00000000 ??_7Dyn@ns@@6B@ +// CHECK-DAG: Data 0x{{[0-9a-f]+}} 0x{{0*[1-9a-f][0-9a-f]*}} 0x00000000 ?global_a@@3UA@@A +// CHECK-DAG: Data 0x{{[0-9a-f]+}} 0x{{0*[1-9a-f][0-9a-f]*}} 0x00000000 ?global_c@@3UC@?$B@_J@ns@@A diff --git a/lldb/test/Shell/SymbolFile/PDB/native-setting.cpp b/lldb/test/Shell/SymbolFile/PDB/native-setting.cpp index f5e5459..54b7f28 100644 --- a/lldb/test/Shell/SymbolFile/PDB/native-setting.cpp +++ b/lldb/test/Shell/SymbolFile/PDB/native-setting.cpp @@ -8,9 +8,9 @@  // RUN: env LLDB_USE_NATIVE_PDB_READER=0 %lldb %t.exe -o 'target modules dump symfile' 2>&1 | FileCheck --check-prefix=ENV0 %s  // RUN: env LLDB_USE_NATIVE_PDB_READER=1 %lldb %t.exe -o 'target modules dump symfile' 2>&1 | FileCheck --check-prefix=ENV1 %s -// RUN: env LLDB_USE_NATIVE_PDB_READER=foo %lldb %t.exe -o 'target modules dump symfile' 2>&1 | FileCheck --check-prefix=ENV0 %s -// RUN: env LLDB_USE_NATIVE_PDB_READER=42 %lldb %t.exe -o 'target modules dump symfile' 2>&1 | FileCheck --check-prefix=ENV0 %s -// RUN: env LLDB_USE_NATIVE_PDB_READER=-1 %lldb %t.exe -o 'target modules dump symfile' 2>&1 | FileCheck --check-prefix=ENV0 %s +// RUN: env LLDB_USE_NATIVE_PDB_READER=foo %lldb %t.exe -o 'target modules dump symfile' 2>&1 | FileCheck --check-prefix=ENV1 %s +// RUN: env LLDB_USE_NATIVE_PDB_READER=42 %lldb %t.exe -o 'target modules dump symfile' 2>&1 | FileCheck --check-prefix=ENV1 %s +// RUN: env LLDB_USE_NATIVE_PDB_READER=-1 %lldb %t.exe -o 'target modules dump symfile' 2>&1 | FileCheck --check-prefix=ENV1 %s  // RUN: env LLDB_USE_NATIVE_PDB_READER=0 %lldb \  // RUN:     -o 'settings set plugin.symbol-file.pdb.reader dia' \ @@ -36,7 +36,7 @@  // NO-ENV-NOT: warning:  // NO-ENV: (lldb) target modules dump symfile  // NO-ENV: Dumping debug symbols for 1 modules. -// NO-ENV: SymbolFile pdb +// NO-ENV: SymbolFile native-pdb  // ENV0-NOT: warning:  // ENV0: (lldb) target modules dump symfile | 
