[Lldb-commits] [lldb] r124513 - /lldb/trunk/test/logging/TestLogging.py

[Johnny Chen]

Author: johnny
Date: Fri Jan 28 18:52:54 2011
New Revision: 124513

URL: http://llvm.org/viewvc/llvm-project?rev=124513&view=rev
Log:
Use different log files for the two test cases in order not to confuse the logging subsystem.

Modified:
    lldb/trunk/test/logging/TestLogging.py

Modified: lldb/trunk/test/logging/TestLogging.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/logging/TestLogging.py?rev=124513&r1=124512&r2=124513&view=diff
==============================================================================
--- lldb/trunk/test/logging/TestLogging.py (original)
+++ lldb/trunk/test/logging/TestLogging.py Fri Jan 28 18:52:54 2011
@@ -14,18 +14,18 @@
     @unittest2.skipUnless(sys.platform.startswith("darwin"), "requires Darwin")
     def test_with_dsym (self):
         self.buildDsym ()
-        self.command_log_tests ()
+        self.command_log_tests ("dsym")
 
     def test_with_dwarf (self):
         self.buildDwarf ()
-        self.command_log_tests ()
+        self.command_log_tests ("dwarf")
 
-    def command_log_tests (self):
+    def command_log_tests (self, type):
         exe = os.path.join (os.getcwd(), "a.out")
         self.expect("file " + exe,
                     patterns = [ "Current executable set to .*a.out" ])
 
-        log_file = os.path.join (os.getcwd(), "lldb-commands-log.txt")
+        log_file = os.path.join (os.getcwd(), "lldb-commands-log-%s.txt" % type)
 
         if (os.path.exists (log_file)):
             os.remove (log_file)
@@ -66,6 +66,7 @@
         f = open (log_file)
         log_lines = f.readlines()
         f.close ()
+        self.runCmd("log disable lldb")
         os.remove (log_file)
 
         err_msg = ""