[Lldb-commits] [lldb] r232092 - XFAIL TestAbbreviations on Linux, improve test

[Vince Harron]

Author: vharron
Date: Thu Mar 12 15:08:45 2015
New Revision: 232092

URL: http://llvm.org/viewvc/llvm-project?rev=232092&view=rev
Log:
XFAIL TestAbbreviations on Linux, improve test

It was failing on gcc 4.8, only passing accidentally on clang 3.5
This patch improves the checking to make sure if fails in all cases
and then XFAILS


Modified:
    lldb/trunk/test/functionalities/abbreviation/TestAbbreviations.py

Modified: lldb/trunk/test/functionalities/abbreviation/TestAbbreviations.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/functionalities/abbreviation/TestAbbreviations.py?rev=232092&r1=232091&r2=232092&view=diff
==============================================================================
--- lldb/trunk/test/functionalities/abbreviation/TestAbbreviations.py (original)
+++ lldb/trunk/test/functionalities/abbreviation/TestAbbreviations.py Thu Mar 12 15:08:45 2015
@@ -85,6 +85,7 @@ class AbbreviationsTestCase(TestBase):
         self.running_abbreviations ()
 
     @dwarf_test
+    @expectedFailureLinux # not related to abbreviations, "dis -f" output has int3 in it
     def test_with_dwarf (self):
         self.buildDwarf ()
         self.running_abbreviations ()
@@ -149,12 +150,18 @@ class AbbreviationsTestCase(TestBase):
                                  "stop reason = breakpoint 2.1" ])
 
         # ARCH, if not specified, defaults to x86_64.
+        self.runCmd("dis -f")
+        disassembly = self.res.GetOutput()
         if self.getArchitecture() in ["", 'x86_64', 'i386']:
-            self.expect("dis -f",
+            # hey! we shouldn't have a software breakpoint in here
+            self.assertFalse("int3" in disassembly)
+            self.expect(disassembly, exe=False,
                         startstr = "a.out`sum(int, int)",
                         substrs = [' mov',
                                    ' addl ',
                                    'ret'])
+        else:
+            self.fail('unimplemented for arch = "{arch}"'.format(arch=self.getArchitecture()))
 
         self.expect("i d l main.cpp",
                     patterns = ["Line table for .*main.cpp in `a.out"])