diff options
author | Pavel Labath <labath@google.com> | 2018-03-21 09:43:50 +0000 |
---|---|---|
committer | Pavel Labath <labath@google.com> | 2018-03-21 09:43:50 +0000 |
commit | cb21797cb76059c3a9b8609ed50b385c337f0c9b (patch) | |
tree | 27e333c55d11e1183d0cbbb18e56ca52ee763dd5 | |
parent | f00d0d15491debcf14e866e32581341dc22435a9 (diff) |
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.
git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@328083 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | packages/Python/lldbsuite/test/lang/cpp/operator-overload/Makefile | 14 | ||||
-rw-r--r-- | packages/Python/lldbsuite/test/lang/cpp/operator-overload/TestOperatorOverload.py | 4 |
2 files changed, 4 insertions, 14 deletions
diff --git a/packages/Python/lldbsuite/test/lang/cpp/operator-overload/Makefile b/packages/Python/lldbsuite/test/lang/cpp/operator-overload/Makefile index ae96a868f..bd8116b91 100644 --- a/packages/Python/lldbsuite/test/lang/cpp/operator-overload/Makefile +++ b/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/packages/Python/lldbsuite/test/lang/cpp/operator-overload/TestOperatorOverload.py b/packages/Python/lldbsuite/test/lang/cpp/operator-overload/TestOperatorOverload.py index 0191e08d2..f541a6617 100644 --- a/packages/Python/lldbsuite/test/lang/cpp/operator-overload/TestOperatorOverload.py +++ b/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()) |