From 98e2b1a8dd8ff03b6289a40a16fe749834257494 Mon Sep 17 00:00:00 2001 From: Raphael Isemann Date: Tue, 22 Jun 2021 12:22:14 +0200 Subject: [PATCH] [lldb] Adjust Clang version requirements for tail_call_frames tests Those tests are all failing for older Clang versions. This is adding the respective test decorators for the passing Clang versions to get the recently revived matrix bot green. --- .../tail_call_frames/cross_dso/TestCrossDSOTailCalls.py | 2 +- .../tail_call_frames/cross_object/TestCrossObjectTailCalls.py | 2 +- .../disambiguate_call_site/TestDisambiguateCallSite.py | 3 ++- .../TestDisambiguatePathsToCommonSink.py | 3 ++- .../disambiguate_tail_call_seq/TestDisambiguateTailCallSeq.py | 3 ++- .../inlining_and_tail_calls/TestInliningAndTailCalls.py | 3 ++- .../tail_call_frames/sbapi_support/TestTailCallFrameSBAPI.py | 2 +- .../thread_step_out_message/TestArtificialFrameStepOutMessage.py | 3 ++- .../tail_call_frames/unambiguous_sequence/TestUnambiguousTailCalls.py | 3 ++- 9 files changed, 15 insertions(+), 9 deletions(-) diff --git a/lldb/test/API/functionalities/tail_call_frames/cross_dso/TestCrossDSOTailCalls.py b/lldb/test/API/functionalities/tail_call_frames/cross_dso/TestCrossDSOTailCalls.py index 9772ceea..45346a4 100644 --- a/lldb/test/API/functionalities/tail_call_frames/cross_dso/TestCrossDSOTailCalls.py +++ b/lldb/test/API/functionalities/tail_call_frames/cross_dso/TestCrossDSOTailCalls.py @@ -15,7 +15,7 @@ class TestCrossDSOTailCalls(TestBase): def setUp(self): TestBase.setUp(self) - @skipIf(compiler="clang", compiler_version=['<', '8.0']) + @skipIf(compiler="clang", compiler_version=['<', '10.0']) @skipIf(dwarf_version=['<', '4']) @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr26265") @expectedFailureAll(archs=['arm', 'aarch64'], bugnumber="llvm.org/PR44561") diff --git a/lldb/test/API/functionalities/tail_call_frames/cross_object/TestCrossObjectTailCalls.py b/lldb/test/API/functionalities/tail_call_frames/cross_object/TestCrossObjectTailCalls.py index 223b7c7..48e1c86 100644 --- a/lldb/test/API/functionalities/tail_call_frames/cross_object/TestCrossObjectTailCalls.py +++ b/lldb/test/API/functionalities/tail_call_frames/cross_object/TestCrossObjectTailCalls.py @@ -15,7 +15,7 @@ class TestCrossObjectTailCalls(TestBase): def setUp(self): TestBase.setUp(self) - @skipIf(compiler="clang", compiler_version=['<', '8.0']) + @skipIf(compiler="clang", compiler_version=['<', '10.0']) @skipIf(dwarf_version=['<', '4']) @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr26265") @expectedFailureAll(archs=['arm', 'aarch64'], bugnumber="llvm.org/PR44561") diff --git a/lldb/test/API/functionalities/tail_call_frames/disambiguate_call_site/TestDisambiguateCallSite.py b/lldb/test/API/functionalities/tail_call_frames/disambiguate_call_site/TestDisambiguateCallSite.py index 699263e..55c718d 100644 --- a/lldb/test/API/functionalities/tail_call_frames/disambiguate_call_site/TestDisambiguateCallSite.py +++ b/lldb/test/API/functionalities/tail_call_frames/disambiguate_call_site/TestDisambiguateCallSite.py @@ -2,7 +2,8 @@ from lldbsuite.test import lldbinline from lldbsuite.test import decorators decor = [decorators.skipUnlessHasCallSiteInfo, - decorators.skipIf(dwarf_version=['<', '4'])] + decorators.skipIf(dwarf_version=['<', '4']), + decorators.skipIf(compiler="clang", compiler_version=['<', '11.0'])] lldbinline.MakeInlineTest(__file__, globals(), name="DisambiguateCallSite_V5", build_dict=dict(CFLAGS_EXTRAS="-O2 -glldb"), decorators=decor) lldbinline.MakeInlineTest(__file__, globals(), name="DisambiguateCallSite_GNU", diff --git a/lldb/test/API/functionalities/tail_call_frames/disambiguate_paths_to_common_sink/TestDisambiguatePathsToCommonSink.py b/lldb/test/API/functionalities/tail_call_frames/disambiguate_paths_to_common_sink/TestDisambiguatePathsToCommonSink.py index 80ed0799..e4b4118 100644 --- a/lldb/test/API/functionalities/tail_call_frames/disambiguate_paths_to_common_sink/TestDisambiguatePathsToCommonSink.py +++ b/lldb/test/API/functionalities/tail_call_frames/disambiguate_paths_to_common_sink/TestDisambiguatePathsToCommonSink.py @@ -2,7 +2,8 @@ from lldbsuite.test import lldbinline from lldbsuite.test import decorators decor = [decorators.skipUnlessHasCallSiteInfo, - decorators.skipIf(dwarf_version=['<', '4'])] + decorators.skipIf(dwarf_version=['<', '4']), + decorators.skipIf(compiler="clang", compiler_version=['<', '11.0'])] lldbinline.MakeInlineTest(__file__, globals(), name="DisambiguatePathsToCommonSink_V5", build_dict=dict(CFLAGS_EXTRAS="-O2 -glldb"), decorators=decor) diff --git a/lldb/test/API/functionalities/tail_call_frames/disambiguate_tail_call_seq/TestDisambiguateTailCallSeq.py b/lldb/test/API/functionalities/tail_call_frames/disambiguate_tail_call_seq/TestDisambiguateTailCallSeq.py index 9e4422c..9bacd89 100644 --- a/lldb/test/API/functionalities/tail_call_frames/disambiguate_tail_call_seq/TestDisambiguateTailCallSeq.py +++ b/lldb/test/API/functionalities/tail_call_frames/disambiguate_tail_call_seq/TestDisambiguateTailCallSeq.py @@ -2,7 +2,8 @@ from lldbsuite.test import lldbinline from lldbsuite.test import decorators decor = [decorators.skipUnlessHasCallSiteInfo, - decorators.skipIf(dwarf_version=['<', '4'])] + decorators.skipIf(dwarf_version=['<', '4']), + decorators.skipIf(compiler="clang", compiler_version=['<', '11.0'])] lldbinline.MakeInlineTest(__file__, globals(), name="DisambiguateTailCallSeq_V5", build_dict=dict(CFLAGS_EXTRAS="-O2 -glldb"), decorators=decor) lldbinline.MakeInlineTest(__file__, globals(), name="DisambiguateTailCallSeq_GNU", diff --git a/lldb/test/API/functionalities/tail_call_frames/inlining_and_tail_calls/TestInliningAndTailCalls.py b/lldb/test/API/functionalities/tail_call_frames/inlining_and_tail_calls/TestInliningAndTailCalls.py index f09a668..d5b6abb 100644 --- a/lldb/test/API/functionalities/tail_call_frames/inlining_and_tail_calls/TestInliningAndTailCalls.py +++ b/lldb/test/API/functionalities/tail_call_frames/inlining_and_tail_calls/TestInliningAndTailCalls.py @@ -2,7 +2,8 @@ from lldbsuite.test import lldbinline from lldbsuite.test import decorators decor = [decorators.skipUnlessHasCallSiteInfo, - decorators.skipIf(dwarf_version=['<', '4'])] + decorators.skipIf(dwarf_version=['<', '4']), + decorators.skipIf(compiler="clang", compiler_version=['<', '11.0'])] lldbinline.MakeInlineTest(__file__, globals(), name="InliningAndTailCalls_V5", build_dict=dict(CFLAGS_EXTRAS="-O2 -glldb"), decorators=decor) lldbinline.MakeInlineTest(__file__, globals(), name="InliningAndTailCalls_GNU", diff --git a/lldb/test/API/functionalities/tail_call_frames/sbapi_support/TestTailCallFrameSBAPI.py b/lldb/test/API/functionalities/tail_call_frames/sbapi_support/TestTailCallFrameSBAPI.py index d26bc02..456c059 100644 --- a/lldb/test/API/functionalities/tail_call_frames/sbapi_support/TestTailCallFrameSBAPI.py +++ b/lldb/test/API/functionalities/tail_call_frames/sbapi_support/TestTailCallFrameSBAPI.py @@ -10,7 +10,7 @@ from lldbsuite.test.lldbtest import * class TestTailCallFrameSBAPI(TestBase): mydir = TestBase.compute_mydir(__file__) - @skipIf(compiler="clang", compiler_version=['<', '8.0']) + @skipIf(compiler="clang", compiler_version=['<', '10.0']) @skipIf(dwarf_version=['<', '4']) @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr26265") def test_tail_call_frame_sbapi(self): diff --git a/lldb/test/API/functionalities/tail_call_frames/thread_step_out_message/TestArtificialFrameStepOutMessage.py b/lldb/test/API/functionalities/tail_call_frames/thread_step_out_message/TestArtificialFrameStepOutMessage.py index ffb693b..e47a3eb 100644 --- a/lldb/test/API/functionalities/tail_call_frames/thread_step_out_message/TestArtificialFrameStepOutMessage.py +++ b/lldb/test/API/functionalities/tail_call_frames/thread_step_out_message/TestArtificialFrameStepOutMessage.py @@ -2,7 +2,8 @@ from lldbsuite.test import lldbinline from lldbsuite.test import decorators decor = [decorators.skipUnlessHasCallSiteInfo, - decorators.skipIf(dwarf_version=['<', '4'])] + decorators.skipIf(dwarf_version=['<', '4']), + decorators.skipIf(compiler="clang", compiler_version=['<', '11.0'])] lldbinline.MakeInlineTest(__file__, globals(), name="ArtificialFrameStepOutMessage_V5", build_dict=dict(CFLAGS_EXTRAS="-O2 -glldb"), decorators=decor) diff --git a/lldb/test/API/functionalities/tail_call_frames/unambiguous_sequence/TestUnambiguousTailCalls.py b/lldb/test/API/functionalities/tail_call_frames/unambiguous_sequence/TestUnambiguousTailCalls.py index ae33926..cbdf40e 100644 --- a/lldb/test/API/functionalities/tail_call_frames/unambiguous_sequence/TestUnambiguousTailCalls.py +++ b/lldb/test/API/functionalities/tail_call_frames/unambiguous_sequence/TestUnambiguousTailCalls.py @@ -2,7 +2,8 @@ from lldbsuite.test import lldbinline from lldbsuite.test import decorators decor = [decorators.skipUnlessHasCallSiteInfo, - decorators.skipIf(dwarf_version=['<', '4'])] + decorators.skipIf(dwarf_version=['<', '4']), + decorators.skipIf(compiler="clang", compiler_version=['<', '11.0'])] lldbinline.MakeInlineTest(__file__, globals(), name="UnambiguousTailCalls_V5", build_dict=dict(CFLAGS_EXTRAS="-O2 -glldb"), decorators=decor) lldbinline.MakeInlineTest(__file__, globals(), name="UnambiguousTailCalls_GNU", -- 2.7.4