From 45872c01ff45d78d1670024af5ab1354b75be021 Mon Sep 17 00:00:00 2001
From: Johnny Chen <johnny.chen@apple.com>
Date: Fri, 13 Apr 2012 00:13:35 +0000
Subject: [PATCH] Fix some test suite errors.  TestForwardDecl.py errors were
 due to bad Makefile.rules, while TestHiddenIvars.py errors due to features
 only available in modern objc runtime.

llvm-svn: 154635
---
 lldb/test/lang/objc/forward-decl/TestForwardDecl.py |  2 ++
 lldb/test/lang/objc/hidden-ivars/TestHiddenIvars.py | 12 ++++++++++++
 lldb/test/make/Makefile.rules                       |  2 +-
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/lldb/test/lang/objc/forward-decl/TestForwardDecl.py b/lldb/test/lang/objc/forward-decl/TestForwardDecl.py
index 0112c4119e27..fbddac4f408a 100644
--- a/lldb/test/lang/objc/forward-decl/TestForwardDecl.py
+++ b/lldb/test/lang/objc/forward-decl/TestForwardDecl.py
@@ -9,11 +9,13 @@ class ForwardDeclTestCase(TestBase):
 
     mydir = os.path.join("lang", "objc", "forward-decl")
 
+    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     @dsym_test
     def test_expr_with_dsym(self):
         self.buildDsym()
         self.expr()
 
+    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     @dwarf_test
     def test_expr_with_dwarf(self):
         self.buildDwarf()
diff --git a/lldb/test/lang/objc/hidden-ivars/TestHiddenIvars.py b/lldb/test/lang/objc/hidden-ivars/TestHiddenIvars.py
index 2621c58d1994..5968dcb716ad 100644
--- a/lldb/test/lang/objc/hidden-ivars/TestHiddenIvars.py
+++ b/lldb/test/lang/objc/hidden-ivars/TestHiddenIvars.py
@@ -9,23 +9,35 @@ class HiddenIvarsTestCase(TestBase):
 
     mydir = os.path.join("lang", "objc", "hidden-ivars")
 
+    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     @dsym_test
     def test_expr_with_dsym(self):
+        if self.getArchitecture() == 'i386':
+            self.skipTest("requires modern objc runtime")
         self.buildDsym()
         self.expr()
 
+    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     @dwarf_test
     def test_expr_with_dwarf(self):
+        if self.getArchitecture() == 'i386':
+            self.skipTest("requires modern objc runtime")
         self.buildDwarf()
         self.expr()
 
+    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     @dsym_test
     def test_frame_variable_with_dsym(self):
+        if self.getArchitecture() == 'i386':
+            self.skipTest("requires modern objc runtime")
         self.buildDsym()
         self.frame_var()
 
+    @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     @dwarf_test
     def test_frame_variable_with_dwarf(self):
+        if self.getArchitecture() == 'i386':
+            self.skipTest("requires modern objc runtime")
         self.buildDwarf()
         self.frame_var()
 
diff --git a/lldb/test/make/Makefile.rules b/lldb/test/make/Makefile.rules
index 53beb1e88e75..864ae92433c0 100644
--- a/lldb/test/make/Makefile.rules
+++ b/lldb/test/make/Makefile.rules
@@ -70,7 +70,7 @@ endif
 CXXFLAGS +=$(CFLAGS)
 LD = $(CC)
 LDFLAGS ?= $(CFLAGS)
-LDFLAGS += $(LD_EXTRAS)
+LDFLAGS += $(LD_EXTRAS) -arch $(ARCH)
 OBJECTS =
 EXE ?= a.out