From abe9599f04f07baae46f4123d4c43d330f34df52 Mon Sep 17 00:00:00 2001 From: Jonas Devlieghere Date: Fri, 12 Aug 2022 10:06:21 -0700 Subject: [PATCH] [lldb] Skip target variable tests on Darwin because of chained fixups When targeting macOS Ventura, ld64 will use authenticated fixups for x86_64 as well as arm64 (where that has always been the case). This results in test failures when using an Xcode 14 toolchain on an Intel mac running macOS Ventura: Failed Tests (3): lldb-api :: commands/target/basic/TestTargetCommand.py lldb-api :: lang/c/global_variables/TestGlobalVariables.py lldb-api :: lang/cpp/char8_t/TestCxxChar8_t.py Rather than trying to come up with a sophisticated decorator based off the deployment target, I marked them all as skipped with a comment explaining why. Differential revision: https://reviews.llvm.org/D131741 --- lldb/test/API/commands/target/basic/TestTargetCommand.py | 4 ++-- lldb/test/API/lang/c/global_variables/TestGlobalVariables.py | 2 +- lldb/test/API/lang/cpp/char8_t/TestCxxChar8_t.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lldb/test/API/commands/target/basic/TestTargetCommand.py b/lldb/test/API/commands/target/basic/TestTargetCommand.py index efbde6a..f377bc0 100644 --- a/lldb/test/API/commands/target/basic/TestTargetCommand.py +++ b/lldb/test/API/commands/target/basic/TestTargetCommand.py @@ -42,7 +42,7 @@ class targetCommandTestCase(TestBase): self.buildAll() self.do_target_command() - @expectedFailureDarwin(archs=["arm64", "arm64e"]) # + @skipIfDarwin # Chained Fixups def test_target_variable_command(self): """Test 'target variable' command before and after starting the inferior.""" d = {'C_SOURCES': 'globals.c', 'EXE': self.getBuildArtifact('globals')} @@ -51,7 +51,7 @@ class targetCommandTestCase(TestBase): self.do_target_variable_command('globals') - @expectedFailureDarwin(archs=["arm64", "arm64e"]) # + @skipIfDarwin # Chained Fixups def test_target_variable_command_no_fail(self): """Test 'target variable' command before and after starting the inferior.""" d = {'C_SOURCES': 'globals.c', 'EXE': self.getBuildArtifact('globals')} diff --git a/lldb/test/API/lang/c/global_variables/TestGlobalVariables.py b/lldb/test/API/lang/c/global_variables/TestGlobalVariables.py index f3668f9..7f5c529 100644 --- a/lldb/test/API/lang/c/global_variables/TestGlobalVariables.py +++ b/lldb/test/API/lang/c/global_variables/TestGlobalVariables.py @@ -18,8 +18,8 @@ class GlobalVariablesTestCase(TestBase): self.source, '// Set break point at this line.') self.shlib_names = ["a"] + @skipIfDarwin # Chained Fixups @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24764") - @expectedFailureDarwin(archs=["arm64", "arm64e"]) # def test_without_process(self): """Test that static initialized variables can be inspected without process.""" diff --git a/lldb/test/API/lang/cpp/char8_t/TestCxxChar8_t.py b/lldb/test/API/lang/cpp/char8_t/TestCxxChar8_t.py index ed9f604..0cf1b1a 100644 --- a/lldb/test/API/lang/cpp/char8_t/TestCxxChar8_t.py +++ b/lldb/test/API/lang/cpp/char8_t/TestCxxChar8_t.py @@ -12,8 +12,8 @@ import lldbsuite.test.lldbutil as lldbutil class CxxChar8_tTestCase(TestBase): + @skipIfDarwin # Chained Fixups @skipIf(compiler="clang", compiler_version=['<', '7.0']) - @expectedFailureDarwin(archs=["arm64", "arm64e"]) # def test_without_process(self): """Test that C++ supports char8_t without a running process.""" self.build() -- 2.7.4