From 95f7572c6f57facd227e882a9d775c348d8e03ee Mon Sep 17 00:00:00 2001 From: Pavel Labath Date: Wed, 21 Mar 2018 09:43:50 +0000 Subject: Fix TestOperatorOverload for 32-bit builds - use more goodies from Makefile.rules to correctly build a 32-bit binary. - avoid hardcoding typeof(nil) in the test. This should partially fix the linux bot. There is still one assertion failure remaining, which I'll have to investigate separately, as I am not experiencing it locally. llvm-svn: 328083 --- .../lldbsuite/test/lang/cpp/operator-overload/Makefile | 14 ++------------ .../lang/cpp/operator-overload/TestOperatorOverload.py | 4 ++-- 2 files changed, 4 insertions(+), 14 deletions(-) (limited to 'lldb/packages/Python/lldbsuite/test/lang/cpp') diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/operator-overload/Makefile b/lldb/packages/Python/lldbsuite/test/lang/cpp/operator-overload/Makefile index ae96a868f18..bd8116b91c3 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/operator-overload/Makefile +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/operator-overload/Makefile @@ -1,18 +1,8 @@ LEVEL = ../../../make CXX_SOURCES = a.cpp b.cpp -CXXFLAGS_NO_DEBUGINFO = -c -CXXFLAGS_DEBUGINFO = -c -g -all: main - -main: a.o b.o - $(CXX) $^ -o $@ $(LDFLAGS) +include $(LEVEL)/Makefile.rules a.o: a.cpp - $(CXX) $< $(CXXFLAGS_NO_DEBUGINFO) -o $@ - -b.o: b.cpp - $(CXX) $< $(CXXFLAGS_DEBUGINFO) -o $@ - -include $(LEVEL)/Makefile.rules + $(CC) $(CFLAGS_NO_DEBUG) -c $< -o $@ diff --git a/lldb/packages/Python/lldbsuite/test/lang/cpp/operator-overload/TestOperatorOverload.py b/lldb/packages/Python/lldbsuite/test/lang/cpp/operator-overload/TestOperatorOverload.py index 0191e08d29f..f541a6617e3 100644 --- a/lldb/packages/Python/lldbsuite/test/lang/cpp/operator-overload/TestOperatorOverload.py +++ b/lldb/packages/Python/lldbsuite/test/lang/cpp/operator-overload/TestOperatorOverload.py @@ -10,13 +10,13 @@ class TestOperatorOverload(TestBase): self.build() (target, process, thread, main_breakpoint) = lldbutil.run_to_source_breakpoint(self, - "break here", lldb.SBFileSpec("b.cpp"), exe_name = "main") + "break here", lldb.SBFileSpec("b.cpp")) frame = thread.GetSelectedFrame() value = frame.EvaluateExpression("x == nil") self.assertTrue(str(value.GetError()) .find("comparison between NULL and non-pointer ('Tinky' and NULL)") != -1) self.assertTrue(str(value.GetError()) - .find("invalid operands to binary expression ('Tinky' and 'long')") + .find("invalid operands to binary expression ('Tinky' and") != -1) self.assertFalse(value.GetError().Success()) -- cgit v1.2.3