[Lldb-commits] [lldb] r358924 - Rename C++ TestGlobalVariables.py to have a distinct name from C version.

[Adrian Prantl via lldb-commits]

Author: adrian
Date: Mon Apr 22 15:16:33 2019
New Revision: 358924

URL: http://llvm.org/viewvc/llvm-project?rev=358924&view=rev
Log:
Rename C++ TestGlobalVariables.py to have a distinct name from C version.

Added:
    lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/global_variables/TestCPPGlobalVariables.py
Removed:
    lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/global_variables/TestGlobalVariables.py

Added: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/global_variables/TestCPPGlobalVariables.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/global_variables/TestCPPGlobalVariables.py?rev=358924&view=auto
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/global_variables/TestCPPGlobalVariables.py (added)
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/global_variables/TestCPPGlobalVariables.py Mon Apr 22 15:16:33 2019
@@ -0,0 +1,41 @@
+"""Test that C++ global variables can be inspected by name and also their mangled name."""
+
+from __future__ import print_function
+
+
+from lldbsuite.test.decorators import *
+from lldbsuite.test.lldbtest import *
+from lldbsuite.test import lldbutil
+
+
+class GlobalVariablesCppTestCase(TestBase):
+
+    mydir = TestBase.compute_mydir(__file__)
+
+    def setUp(self):
+        TestBase.setUp(self)
+        self.source = lldb.SBFileSpec('main.cpp')
+
+    @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24764")
+    def test(self):
+        self.build()
+
+        (target, _, _, _) = lldbutil.run_to_source_breakpoint(self, "// Set break point at this line.", self.source)
+        
+        # Check that we can access g_file_global_int by its name
+        self.expect("target variable g_file_global_int", VARIABLES_DISPLAYED_CORRECTLY,
+                    substrs=['42'])
+        self.expect("target variable abc::g_file_global_int", VARIABLES_DISPLAYED_CORRECTLY,
+                    substrs=['42'])
+        self.expect("target variable xyz::g_file_global_int", VARIABLES_DISPLAYED_CORRECTLY,
+                    error=True, substrs=['can\'t find global variable'])
+
+        # Check that we can access g_file_global_int by its mangled name
+        addr = target.EvaluateExpression("&abc::g_file_global_int").GetValueAsUnsigned()
+        self.assertTrue(addr != 0)
+        mangled = lldb.SBAddress(addr, target).GetSymbol().GetMangledName()
+        self.assertTrue(mangled != None)
+        gv = target.FindFirstGlobalVariable(mangled)
+        self.assertTrue(gv.IsValid())
+        self.assertEqual(gv.GetName(), "abc::g_file_global_int")
+        self.assertEqual(gv.GetValueAsUnsigned(), 42)

Removed: lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/global_variables/TestGlobalVariables.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/global_variables/TestGlobalVariables.py?rev=358923&view=auto
==============================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/global_variables/TestGlobalVariables.py (original)
+++ lldb/trunk/packages/Python/lldbsuite/test/lang/cpp/global_variables/TestGlobalVariables.py (removed)
@@ -1,41 +0,0 @@
-"""Test that C++ global variables can be inspected by name and also their mangled name."""
-
-from __future__ import print_function
-
-
-from lldbsuite.test.decorators import *
-from lldbsuite.test.lldbtest import *
-from lldbsuite.test import lldbutil
-
-
-class GlobalVariablesCppTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
-    def setUp(self):
-        TestBase.setUp(self)
-        self.source = lldb.SBFileSpec('main.cpp')
-
-    @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24764")
-    def test(self):
-        self.build()
-
-        (target, _, _, _) = lldbutil.run_to_source_breakpoint(self, "// Set break point at this line.", self.source)
-        
-        # Check that we can access g_file_global_int by its name
-        self.expect("target variable g_file_global_int", VARIABLES_DISPLAYED_CORRECTLY,
-                    substrs=['42'])
-        self.expect("target variable abc::g_file_global_int", VARIABLES_DISPLAYED_CORRECTLY,
-                    substrs=['42'])
-        self.expect("target variable xyz::g_file_global_int", VARIABLES_DISPLAYED_CORRECTLY,
-                    error=True, substrs=['can\'t find global variable'])
-
-        # Check that we can access g_file_global_int by its mangled name
-        addr = target.EvaluateExpression("&abc::g_file_global_int").GetValueAsUnsigned()
-        self.assertTrue(addr != 0)
-        mangled = lldb.SBAddress(addr, target).GetSymbol().GetMangledName()
-        self.assertTrue(mangled != None)
-        gv = target.FindFirstGlobalVariable(mangled)
-        self.assertTrue(gv.IsValid())
-        self.assertEqual(gv.GetName(), "abc::g_file_global_int")
-        self.assertEqual(gv.GetValueAsUnsigned(), 42)