[Lldb-commits] [lldb] r114493 - in /lldb/trunk/test: conditional_break/TestConditionalBreak.py conditional_break/conditional_break.py lldbtest.py

[Johnny Chen]

Author: johnny
Date: Tue Sep 21 17:34:45 2010
New Revision: 114493

URL: http://llvm.org/viewvc/llvm-project?rev=114493&view=rev
Log:
Wrapped the subclass-specific cleanup call within a try:except: clause.
And removed the informational output from the conditional_break test case.

Modified:
    lldb/trunk/test/conditional_break/TestConditionalBreak.py
    lldb/trunk/test/conditional_break/conditional_break.py
    lldb/trunk/test/lldbtest.py

Modified: lldb/trunk/test/conditional_break/TestConditionalBreak.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/conditional_break/TestConditionalBreak.py?rev=114493&r1=114492&r2=114493&view=diff
==============================================================================
--- lldb/trunk/test/conditional_break/TestConditionalBreak.py (original)
+++ lldb/trunk/test/conditional_break/TestConditionalBreak.py Tue Sep 21 17:34:45 2010
@@ -57,7 +57,7 @@
             process = target.GetProcess()
             thread = process.GetThreadAtIndex(0)
             import lldbutil
-            lldbutil.PrintStackTrace(thread)
+            #lldbutil.PrintStackTrace(thread)
             
             if thread.GetNumFrames() >= 2:
                 frame0 = thread.GetFrameAtIndex(0)

Modified: lldb/trunk/test/conditional_break/conditional_break.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/conditional_break/conditional_break.py?rev=114493&r1=114492&r2=114493&view=diff
==============================================================================
--- lldb/trunk/test/conditional_break/conditional_break.py (original)
+++ lldb/trunk/test/conditional_break/conditional_break.py Tue Sep 21 17:34:45 2010
@@ -24,15 +24,16 @@
     # of the leaf function c() is a().  If it's not the right caller, we ask the
     # command interpreter to continue execution.
 
-    print >> sys.stdout, "Checking call frames..."
-    lldbutil.PrintStackTrace(thread)
+    #print >> sys.stdout, "Checking call frames..."
+    #lldbutil.PrintStackTrace(thread)
     if thread.GetNumFrames() >= 2:
         funcs = lldbutil.GetFunctionNames(thread)
-        print >> sys.stdout, funcs[0], "called from", funcs[1]
+        #print >> sys.stdout, funcs[0], "called from", funcs[1]
         if (funcs[0] == 'c' and funcs[1] == 'a'):
-            print >> sys.stdout, "Stopped at c() with immediate caller as a()."
+            #print >> sys.stdout, "Stopped at c() with immediate caller as a()."
+            pass
         else:
-            print >> sys.stdout, "Continuing..."
+            #print >> sys.stdout, "Continuing..."
             ci.HandleCommand("process continue", res)
 
     return True

Modified: lldb/trunk/test/lldbtest.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lldbtest.py?rev=114493&r1=114492&r2=114493&view=diff
==============================================================================
--- lldb/trunk/test/lldbtest.py (original)
+++ lldb/trunk/test/lldbtest.py Tue Sep 21 17:34:45 2010
@@ -96,7 +96,7 @@
 $ 
 """
 
-import os, sys
+import os, sys, traceback
 import re
 from subprocess import *
 import time
@@ -305,7 +305,11 @@
         if getattr(cls, "classCleanup", None):
             if traceAlways:
                 print "Call class-specific cleanup function for class:", cls
-            cls.classCleanup()
+            try:
+                cls.classCleanup()
+            except:
+                exc_type, exc_value, exc_tb = sys.exc_info()
+                traceback.print_exception(exc_type, exc_value, exc_tb)
 
         # Restore old working directory.
         if traceAlways: