diff --git a/lldb/test/API/linux/aarch64/mte_core_file/TestAArch64LinuxMTEMemoryTagCoreFile.py b/lldb/test/API/linux/aarch64/mte_core_file/TestAArch64LinuxMTEMemoryTagCoreFile.py --- a/lldb/test/API/linux/aarch64/mte_core_file/TestAArch64LinuxMTEMemoryTagCoreFile.py +++ b/lldb/test/API/linux/aarch64/mte_core_file/TestAArch64LinuxMTEMemoryTagCoreFile.py @@ -17,7 +17,8 @@ MTE_BUF_ADDR = hex(0xffff82c74000) BUF_ADDR = hex(0xffff82c73000) - @skipIfLLVMTargetMissing("AArch64") + @skipUnlessArch("aarch64") + @skipUnlessPlatform(["linux"]) def test_mte_tag_core_file_memory_region(self): """ Test that memory regions are marked as tagged when there is a tag segment in the core file. """ @@ -43,7 +44,8 @@ self.expect("memory region {}".format(self.BUF_ADDR), patterns=[tagged], matching=False) - @skipIfLLVMTargetMissing("AArch64") + @skipUnlessArch("aarch64") + @skipUnlessPlatform(["linux"]) def test_mte_tag_core_file_tag_write(self): """ Test that "memory tag write" does not work with core files as they are read only. """ @@ -52,7 +54,8 @@ self.expect("memory tag write {} 1".format(self.MTE_BUF_ADDR), error=True, patterns=["error: elf-core does not support writing memory tags"]) - @skipIfLLVMTargetMissing("AArch64") + @skipUnlessArch("aarch64") + @skipUnlessPlatform(["linux"]) def test_mte_tag_core_file_tag_read(self): """ Test that "memory tag read" works with core files.""" self.runCmd("target create --core core.mte") @@ -155,7 +158,8 @@ "\[0x[A-Fa-f0-9]+10, 0x[A-Fa-f0-9]+20\): 0x1 \(mismatch\)\n", "\[0x[A-Fa-f0-9]+20, 0x[A-Fa-f0-9]+30\): 0x2 \(mismatch\)$"]) - @skipIfLLVMTargetMissing("AArch64") + @skipUnlessArch("aarch64") + @skipUnlessPlatform(["linux"]) def test_mte_commands_no_mte(self): """ Test that memory tagging commands fail on an AArch64 corefile without any tag segments."""