summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lldb/test/lang/cpp/rdar12991846/Makefile2
-rw-r--r--lldb/test/lang/cpp/rdar12991846/TestRdar12991846.py3
-rw-r--r--lldb/test/lang/cpp/stl/Makefile2
3 files changed, 5 insertions, 2 deletions
diff --git a/lldb/test/lang/cpp/rdar12991846/Makefile b/lldb/test/lang/cpp/rdar12991846/Makefile
index 397bd743ea6..f447fee0197 100644
--- a/lldb/test/lang/cpp/rdar12991846/Makefile
+++ b/lldb/test/lang/cpp/rdar12991846/Makefile
@@ -1,7 +1,7 @@
LEVEL = ../../../make
CXX_SOURCES := main.cpp
-CFLAGS :=-arch x86_64 -gdwarf-2 -O0 -std=c++11
+CFLAGS := -gdwarf-2 -O0 -std=c++11
clean: OBJECTS+=$(wildcard main.d.*)
diff --git a/lldb/test/lang/cpp/rdar12991846/TestRdar12991846.py b/lldb/test/lang/cpp/rdar12991846/TestRdar12991846.py
index 2638adf038e..601c8e9e612 100644
--- a/lldb/test/lang/cpp/rdar12991846/TestRdar12991846.py
+++ b/lldb/test/lang/cpp/rdar12991846/TestRdar12991846.py
@@ -50,6 +50,9 @@ class Rdar12991846TestCase(TestBase):
def rdar12991846(self):
"""Test that the expression parser returns proper Unicode strings."""
+ if self.getArchitecture() in ['i386']:
+ self.skipTest("Skipping because this test is known to crash on i386")
+
exe = os.path.join(os.getcwd(), "a.out")
# Create a target by the debugger.
diff --git a/lldb/test/lang/cpp/stl/Makefile b/lldb/test/lang/cpp/stl/Makefile
index 9edefdf93a9..479b6d6b693 100644
--- a/lldb/test/lang/cpp/stl/Makefile
+++ b/lldb/test/lang/cpp/stl/Makefile
@@ -1,7 +1,7 @@
LEVEL = ../../../make
CXX_SOURCES := main.cpp
-CFLAGS :=-arch x86_64 -gdwarf-2 -O0
+CFLAGS := -gdwarf-2 -O0
clean: OBJECTS+=$(wildcard main.d.*)
OpenPOWER on IntegriCloud