summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohnny Chen <johnny.chen@apple.com>2011-08-24 22:30:47 +0000
committerJohnny Chen <johnny.chen@apple.com>2011-08-24 22:30:47 +0000
commitdd6be27427ee0fd5e697aa7f93f317b593ab3874 (patch)
tree151eecd418d53963116ee10d9a6dcffe665bb40e
parentb2a2c031b82ecc4e1850e8ee84026ee8c6d13c36 (diff)
downloadbcm5719-llvm-dd6be27427ee0fd5e697aa7f93f317b593ab3874.tar.gz
bcm5719-llvm-dd6be27427ee0fd5e697aa7f93f317b593ab3874.zip
Remove skip decorator now that crash has been fixed.
Fix a compie warning for main.cpp. llvm-svn: 138503
-rw-r--r--lldb/test/lang/cpp/this/TestCPPThis.py2
-rw-r--r--lldb/test/lang/cpp/this/main.cpp2
2 files changed, 1 insertions, 3 deletions
diff --git a/lldb/test/lang/cpp/this/TestCPPThis.py b/lldb/test/lang/cpp/this/TestCPPThis.py
index 362f16328e9..13ebf9003f2 100644
--- a/lldb/test/lang/cpp/this/TestCPPThis.py
+++ b/lldb/test/lang/cpp/this/TestCPPThis.py
@@ -8,7 +8,6 @@ class CPPThisTestCase(TestBase):
mydir = os.path.join("lang", "cpp", "this")
- @unittest2.skip("segmentation fault -- skipping")
@unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
#rdar://problem/9962849
@expectedFailureClang
@@ -17,7 +16,6 @@ class CPPThisTestCase(TestBase):
self.buildDsym()
self.static_method_commands()
- @unittest2.skip("segmentation fault -- skipping")
#rdar://problem/9962849
@expectedFailureClang
def test_with_dwarf_and_run_command(self):
diff --git a/lldb/test/lang/cpp/this/main.cpp b/lldb/test/lang/cpp/this/main.cpp
index 80afce1c2da..e70823b9a3a 100644
--- a/lldb/test/lang/cpp/this/main.cpp
+++ b/lldb/test/lang/cpp/this/main.cpp
@@ -16,7 +16,7 @@ public:
int accessMemberConst() const;
static int accessStaticMember();
- int accessMemberInline(int a) __attribute__ ((always_inline))
+ void accessMemberInline(int a) __attribute__ ((always_inline))
{
m_a = a; // breakpoint 4
}
OpenPOWER on IntegriCloud