[Lldb-commits] [lldb] r331242 - Fix type_lookup test to make buildbots happy
Eugene Zemtsov via lldb-commits
lldb-commits at lists.llvm.org
Mon Apr 30 20:06:05 PDT 2018
Author: eugene
Date: Mon Apr 30 20:06:05 2018
New Revision: 331242
URL: http://llvm.org/viewvc/llvm-project?rev=331242&view=rev
Log:
Fix type_lookup test to make buildbots happy
Added:
lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/type_lookup/TestCppTypeLookup.py
- copied, changed from r331239, lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/type_lookup/TestTypeLookup.py
Removed:
lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/type_lookup/TestTypeLookup.py
Modified:
lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/type_lookup/Makefile
lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/type_lookup/main.cpp
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/type_lookup/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/type_lookup/Makefile?rev=331242&r1=331241&r2=331242&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/type_lookup/Makefile (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/type_lookup/Makefile Mon Apr 30 20:06:05 2018
@@ -1,3 +1,3 @@
LEVEL = ../../../make
-C_SOURCES := main.c
+CXX_SOURCES := main.cpp
include $(LEVEL)/Makefile.rules
Copied: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/type_lookup/TestCppTypeLookup.py (from r331239, lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/type_lookup/TestTypeLookup.py)
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/type_lookup/TestCppTypeLookup.py?p2=lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/type_lookup/TestCppTypeLookup.py&p1=lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/type_lookup/TestTypeLookup.py&r1=331239&r2=331242&rev=331242&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/type_lookup/TestTypeLookup.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/type_lookup/TestCppTypeLookup.py Mon Apr 30 20:06:05 2018
@@ -10,7 +10,7 @@ import lldbsuite.test.lldbutil as lldbut
from lldbsuite.test.lldbtest import *
from lldbsuite.test import decorators
-class TestTypeLookup(TestBase):
+class TestCppTypeLookup(TestBase):
mydir = TestBase.compute_mydir(__file__)
Removed: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/type_lookup/TestTypeLookup.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/type_lookup/TestTypeLookup.py?rev=331241&view=auto
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/type_lookup/TestTypeLookup.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/type_lookup/TestTypeLookup.py (removed)
@@ -1,89 +0,0 @@
-"""
-Test that we can lookup types correctly in the expression parser
-"""
-
-from __future__ import print_function
-
-
-import lldb
-import lldbsuite.test.lldbutil as lldbutil
-from lldbsuite.test.lldbtest import *
-from lldbsuite.test import decorators
-
-class TestTypeLookup(TestBase):
-
- mydir = TestBase.compute_mydir(__file__)
-
- def check_value(self, value, ivar_name, ivar_value):
- self.assertTrue(value.GetError().Success(),
- "Invalid valobj: %s" % (
- value.GetError().GetCString()))
- ivar = value.GetChildMemberWithName(ivar_name)
- self.assertTrue(ivar.GetError().Success(),
- "Failed to fetch ivar named '%s'" % (ivar_name))
- self.assertEqual(ivar_value,
- ivar.GetValueAsSigned(),
- "Got the right value for ivar")
-
- def test_namespace_only(self):
- """
- Test that we fail to lookup a struct type that exists only in a
- namespace.
- """
- self.build()
- self.main_source_file = lldb.SBFileSpec("main.cpp")
- (target, process, thread, bkpt) = lldbutil.run_to_source_breakpoint(
- self, "Set a breakpoint here", self.main_source_file)
-
- # Get frame for current thread
- frame = thread.GetSelectedFrame()
-
- # Make sure we don't accidentally accept structures that exist only
- # in namespaces when evaluating expressions with top level types.
- # Prior to the revision that added this test, we would accidentally
- # accept types from namespaces, so this will ensure we don't regress
- # to that behavior again
- expr_result = frame.EvaluateExpression("*((namespace_only *)&i)")
- self.assertTrue(expr_result.GetError().Fail(),
- "'namespace_only' exists in namespace only")
-
- # Make sure we can find the correct type in a namespace "a"
- expr_result = frame.EvaluateExpression("*((a::namespace_only *)&i)")
- self.check_value(expr_result, "a", 123)
- # Make sure we can find the correct type in a namespace "b"
- expr_result = frame.EvaluateExpression("*((b::namespace_only *)&i)")
- self.check_value(expr_result, "b", 123)
-
- # Make sure we can find the correct type in the root namespace
- expr_result = frame.EvaluateExpression("*((namespace_and_file *)&i)")
- self.check_value(expr_result, "ff", 123)
- # Make sure we can find the correct type in a namespace "a"
- expr_result = frame.EvaluateExpression(
- "*((a::namespace_and_file *)&i)")
- self.check_value(expr_result, "aa", 123)
- # Make sure we can find the correct type in a namespace "b"
- expr_result = frame.EvaluateExpression(
- "*((b::namespace_and_file *)&i)")
- self.check_value(expr_result, "bb", 123)
-
- # Make sure we don't accidentally accept structures that exist only
- # in namespaces when evaluating expressions with top level types.
- # Prior to the revision that added this test, we would accidentally
- # accept types from namespaces, so this will ensure we don't regress
- # to that behavior again
- expr_result = frame.EvaluateExpression("*((in_contains_type *)&i)")
- self.assertTrue(expr_result.GetError().Fail(),
- "'in_contains_type' exists in struct only")
-
- # Make sure we can find the correct type in the root namespace
- expr_result = frame.EvaluateExpression(
- "*((contains_type::in_contains_type *)&i)")
- self.check_value(expr_result, "fff", 123)
- # Make sure we can find the correct type in a namespace "a"
- expr_result = frame.EvaluateExpression(
- "*((a::contains_type::in_contains_type *)&i)")
- self.check_value(expr_result, "aaa", 123)
- # Make sure we can find the correct type in a namespace "b"
- expr_result = frame.EvaluateExpression(
- "*((b::contains_type::in_contains_type *)&i)")
- self.check_value(expr_result, "bbb", 123)
Modified: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/type_lookup/main.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/type_lookup/main.cpp?rev=331242&r1=331241&r2=331242&view=diff
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/type_lookup/main.cpp (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/type_lookup/main.cpp Mon Apr 30 20:06:05 2018
@@ -1,4 +1,4 @@
-//===-- main.c --------------------------------------------------*- C++ -*-===//
+//===-- main.cpp ------------------------------------------------*- C++ -*-===//
//
// The LLVM Compiler Infrastructure
//
More information about the lldb-commits
mailing list