[Lldb-commits] [lldb] r139914 - /lldb/trunk/test/dotest.py

[Johnny Chen]

Author: johnny
Date: Fri Sep 16 12:50:44 2011
New Revision: 139914

URL: http://llvm.org/viewvc/llvm-project?rev=139914&view=rev
Log:
Rephrase the checkDsymForUUIDIsNotOn() a bit so that in the normal case where automatic
lookup and cacheing of dSYMs is not enabled, the 'defaults read com.apple.DebugSymbols'
output is not shown.

Modified:
    lldb/trunk/test/dotest.py

Modified: lldb/trunk/test/dotest.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/dotest.py?rev=139914&r1=139913&r2=139914&view=diff
==============================================================================
--- lldb/trunk/test/dotest.py (original)
+++ lldb/trunk/test/dotest.py Fri Sep 16 12:50:44 2011
@@ -603,7 +603,7 @@
         if not lldbExec:
             lldbExec = lldbHere
         os.environ["LLDB_BUILD_DIR"] = os.path.split(lldbExec)[0]
-        print os.environ["LLDB_BUILD_DIR"]
+        print "LLDB build dir:", os.environ["LLDB_BUILD_DIR"]
 
     # One last chance to locate the 'lldb' executable.
     if not lldbExec:
@@ -796,11 +796,12 @@
 # ======================================== #
 
 def checkDsymForUUIDIsNotOn():
-    pipe = subprocess.Popen(["defaults", "read", "com.apple.DebugSymbols"], stdout = subprocess.PIPE)
-    debug_symbols_output = pipe.stdout.read()
-    if "DBGFileMappedPaths = " in debug_symbols_output:
-        print "defaults read com.apple.DebugSysmbols =>"
-        print debug_symbols_output
+    cmd = ["defaults", "read", "com.apple.DebugSymbols"]
+    pipe = subprocess.Popen(cmd, stdout = subprocess.PIPE, stderr = subprocess.STDOUT)
+    cmd_output = pipe.stdout.read()
+    if "DBGFileMappedPaths = " in cmd_output:
+        print "Executing: '%s' =>" % ' '.join(cmd)
+        print cmd_output
         print "Disable automatic lookup and caching of dSYMs before running the test suite!"
         print "Exiting..."
         sys.exit(0)