Author: labath
Date: Wed Mar 21 02:43:50 2018
New Revision: 328083
URL: http://llvm.org/viewvc/llvm-project?rev=328083&view=rev
Log:
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.
Modified:
lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/operator-overload/Makefile
lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/operator-overload/TestOperatorOverload.py
Modified:
lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/operator-overload/Makefile
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/operator-overload/Makefile?rev=328083&r1=328082&r2=328083&view=diff
==============================================================================
---
lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/operator-overload/Makefile
(original)
+++
lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/operator-overload/Makefile
Wed Mar 21 02:43:50 2018
@@ -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 $@
Modified:
lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/operator-overload/TestOperatorOverload.py
URL:
http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/operator-overload/TestOperatorOverload.py?rev=328083&r1=328082&r2=328083&view=diff
==============================================================================
---
lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/operator-overload/TestOperatorOverload.py
(original)
+++
lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/operator-overload/TestOperatorOverload.py
Wed Mar 21 02:43:50 2018
@@ -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())
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
