Fix and xfail TestRegisterVariables after rL265498

llvm-svn: 265527

diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/register_variables/Makefile b/lldb/packages/Python/lldbsuite/test/lang/c/register_variables/Makefile
index 0b2d3a2..a09f73f 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/c/register_variables/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/register_variables/Makefile
@@ -2,12 +2,6 @@ LEVEL = ../../../make
 
 C_SOURCES := test.c
 
-CFLAGS := -g -O1
-
-$(info OS: $(OS))
-HOST_OS = $(shell uname -s)
-ifeq "$(HOST_OS)" "Darwin"
-       FRAMEWORK_INCLUDES = -isysroot $(shell xcrun -show-sdk-path)
-endif
+CFLAGS_EXTRAS += -O1
 
 include $(LEVEL)/Makefile.rules

diff --git a/lldb/packages/Python/lldbsuite/test/lang/c/register_variables/TestRegisterVariables.py b/lldb/packages/Python/lldbsuite/test/lang/c/register_variables/TestRegisterVariables.py
index 73db3d5..0855a02 100644 (file)
--- a/lldb/packages/Python/lldbsuite/test/lang/c/register_variables/TestRegisterVariables.py
+++ b/lldb/packages/Python/lldbsuite/test/lang/c/register_variables/TestRegisterVariables.py
@@ -92,7 +92,8 @@ class RegisterVariableTestCase(TestBase):
 
 
     @expectedFailureAll(compiler="clang", compiler_version=['<', '3.5'])
-    @expectedFailureAll(compiler="gcc", compiler_version=['=', '4.8.2'])
+    @expectedFailureAll(compiler="gcc", compiler_version=['>=', '4.8.2'])
+    @expectedFailureAll(oslist="linux", archs="i386")
     def test_and_run_command(self):
         """Test expressions on register values."""