[Lldb-commits] [lldb] r155521 - in /lldb/trunk/test/lang/objc/objc++: Makefile TestObjC++.py TestObjCXX.py

[Johnny Chen]

Author: johnny
Date: Tue Apr 24 20:20:15 2012
New Revision: 155521

URL: http://llvm.org/viewvc/llvm-project?rev=155521&view=rev
Log:
Renaming to rid of the '++' in the test file name and simplify the Makefile.

Added:
    lldb/trunk/test/lang/objc/objc++/TestObjCXX.py
      - copied unchanged from r155519, lldb/trunk/test/lang/objc/objc++/TestObjC++.py
Removed:
    lldb/trunk/test/lang/objc/objc++/TestObjC++.py
Modified:
    lldb/trunk/test/lang/objc/objc++/Makefile

Modified: lldb/trunk/test/lang/objc/objc++/Makefile
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/objc/objc%2B%2B/Makefile?rev=155521&r1=155520&r2=155521&view=diff
==============================================================================
--- lldb/trunk/test/lang/objc/objc++/Makefile (original)
+++ lldb/trunk/test/lang/objc/objc++/Makefile Tue Apr 24 20:20:15 2012
@@ -1,10 +1,6 @@
 LEVEL = ../../../make
 
 OBJCXX_SOURCES := main.mm
-
-include $(LEVEL)/Makefile.rules
-
 LDFLAGS += -framework Foundation
 
-main.o:	main.mm
-	$(CXX) $(CXXFLAGS) -c -o main.o main.mm
+include $(LEVEL)/Makefile.rules

Removed: lldb/trunk/test/lang/objc/objc++/TestObjC++.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lang/objc/objc%2B%2B/TestObjC%2B%2B.py?rev=155520&view=auto
==============================================================================
--- lldb/trunk/test/lang/objc/objc++/TestObjC++.py (original)
+++ lldb/trunk/test/lang/objc/objc++/TestObjC++.py (removed)
@@ -1,47 +0,0 @@
-"""
-Make sure that ivars of Objective-C++ classes are visible in LLDB.
-"""
-
-import os, time
-import unittest2
-import lldb
-from lldbtest import *
-
-class ObjCXXTestCase(TestBase):
-
-    mydir = os.path.join("lang", "objc", "objc++")
-
-    @dsym_test
-    def test_break_with_dsym(self):
-        """Test ivars of Objective-C++ classes"""
-        if self.getArchitecture() == 'i386':
-            self.skipTest("requires Objective-C 2.0 runtime")
-        self.buildDsym()
-        self.do_testObjCXXClasses()
-
-    @dwarf_test
-    def test_break_with_dwarf(self):
-        """Test ivars of Objective-C++ classes"""
-        if self.getArchitecture() == 'i386':
-            self.skipTest("requires Objective-C 2.0 runtime")
-        self.buildDwarf()
-        self.do_testObjCXXClasses()
-
-    def do_testObjCXXClasses(self):
-        """Test ivars of Objective-C++ classes"""
-        exe = os.path.join(os.getcwd(), "a.out")
-        self.runCmd("file " + exe, CURRENT_EXECUTABLE_SET)
-
-        self.expect("breakpoint set -p 'breakpoint 1'", BREAKPOINT_CREATED,
-            startstr = "Breakpoint created")
-
-        self.runCmd("run", RUN_SUCCEEDED)
-
-        self.expect("expr f->f", "Found ivar in class",
-            substrs = ["= 3"])
-        
-if __name__ == '__main__':
-    import atexit
-    lldb.SBDebugger.Initialize()
-    atexit.register(lambda: lldb.SBDebugger.Terminate())
-    unittest2.main()