Skip tail call frame tests when dwarf_version < 4

rdar://problem/54656572 llvm-svn: 369821
Pigrecos · Aug 23, 2019 · 77017ad · 77017ad
1 parent 665a642
commit 77017ad
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 8 deletions.
diff --git a/...st/functionalities/tail_call_frames/ambiguous_tail_call_seq1/TestAmbiguousTailCallSeq1.py b/...st/functionalities/tail_call_frames/ambiguous_tail_call_seq1/TestAmbiguousTailCallSeq1.py
@@ -2,4 +2,5 @@
 from lldbsuite.test import decorators
 
 lldbinline.MakeInlineTest(__file__, globals(),
- [decorators.skipUnlessHasCallSiteInfo])
+ [decorators.skipUnlessHasCallSiteInfo,
+ decorators.skipIf(dwarf_version=['<', '4'])])
diff --git a/...st/functionalities/tail_call_frames/ambiguous_tail_call_seq2/TestAmbiguousTailCallSeq2.py b/...st/functionalities/tail_call_frames/ambiguous_tail_call_seq2/TestAmbiguousTailCallSeq2.py
@@ -2,4 +2,5 @@
 from lldbsuite.test import decorators
 
 lldbinline.MakeInlineTest(__file__, globals(),
- [decorators.skipUnlessHasCallSiteInfo])
+ [decorators.skipUnlessHasCallSiteInfo,
+ decorators.skipIf(dwarf_version=['<', '4'])])
diff --git a/.../test/functionalities/tail_call_frames/disambiguate_call_site/TestDisambiguateCallSite.py b/.../test/functionalities/tail_call_frames/disambiguate_call_site/TestDisambiguateCallSite.py
@@ -2,4 +2,5 @@
 from lldbsuite.test import decorators
 
 lldbinline.MakeInlineTest(__file__, globals(),
- [decorators.skipUnlessHasCallSiteInfo])
+ [decorators.skipUnlessHasCallSiteInfo,
+ decorators.skipIf(dwarf_version=['<', '4'])])
diff --git a/...s/tail_call_frames/disambiguate_paths_to_common_sink/TestDisambiguatePathsToCommonSink.py b/...s/tail_call_frames/disambiguate_paths_to_common_sink/TestDisambiguatePathsToCommonSink.py
@@ -2,4 +2,5 @@
 from lldbsuite.test import decorators
 
 lldbinline.MakeInlineTest(__file__, globals(),
- [decorators.skipUnlessHasCallSiteInfo])
+ [decorators.skipUnlessHasCallSiteInfo,
+ decorators.skipIf(dwarf_version=['<', '4'])])
diff --git a/...unctionalities/tail_call_frames/disambiguate_tail_call_seq/TestDisambiguateTailCallSeq.py b/...unctionalities/tail_call_frames/disambiguate_tail_call_seq/TestDisambiguateTailCallSeq.py
@@ -2,4 +2,5 @@
 from lldbsuite.test import decorators
 
 lldbinline.MakeInlineTest(__file__, globals(),
- [decorators.skipUnlessHasCallSiteInfo])
+ [decorators.skipUnlessHasCallSiteInfo,
+ decorators.skipIf(dwarf_version=['<', '4'])])
diff --git a/...test/functionalities/tail_call_frames/inlining_and_tail_calls/TestInliningAndTailCalls.py b/...test/functionalities/tail_call_frames/inlining_and_tail_calls/TestInliningAndTailCalls.py
@@ -2,4 +2,5 @@
 from lldbsuite.test import decorators
 
 lldbinline.MakeInlineTest(__file__, globals(),
- [decorators.skipUnlessHasCallSiteInfo])
+ [decorators.skipUnlessHasCallSiteInfo,
+ decorators.skipIf(dwarf_version=['<', '4'])])
diff --git a/...tionalities/tail_call_frames/thread_step_out_message/TestArtificialFrameStepOutMessage.py b/...tionalities/tail_call_frames/thread_step_out_message/TestArtificialFrameStepOutMessage.py
@@ -2,4 +2,5 @@
 from lldbsuite.test import decorators
 
 lldbinline.MakeInlineTest(__file__, globals(),
- [decorators.skipUnlessHasCallSiteInfo])
+ [decorators.skipUnlessHasCallSiteInfo,
+ decorators.skipIf(dwarf_version=['<', '4'])])
diff --git a/...te/test/functionalities/tail_call_frames/unambiguous_sequence/TestUnambiguousTailCalls.py b/...te/test/functionalities/tail_call_frames/unambiguous_sequence/TestUnambiguousTailCalls.py
@@ -2,4 +2,5 @@
 from lldbsuite.test import decorators
 
 lldbinline.MakeInlineTest(__file__, globals(),
- [decorators.skipUnlessHasCallSiteInfo])
+ [decorators.skipUnlessHasCallSiteInfo,
+ decorators.skipIf(dwarf_version=['<', '4'])])
diff --git a/lldb/packages/Python/lldbsuite/test/lldbtest.py b/lldb/packages/Python/lldbsuite/test/lldbtest.py
@@ -1299,6 +1299,7 @@ def getDwarfVersion(self):
  driver_output = check_output(
  [self.getCompiler()] + '-g -c -x c - -o - -###'.split(),
  stderr=STDOUT)
+ driver_output = driver_output.decode("utf-8")
  for line in driver_output.split(os.linesep):
  m = re.search('dwarf-version=([0-9])', line)
  if m: