Minor LLDB test improvements
- fix TestCPPBool (was failing with some versions of GCC due to num_breakpoint_locations)
- speed up tests by skipping git/svn revision parsing by the test harness when running in lit-compatible (parsable) mode
This should resolve the failures reported by http://lab.llvm.org:8011/builders/lldb-x86_64-linux
git-svn-id: https://llvm.org/svn/llvm-project/lldb/trunk@176972 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/dotest.py b/test/dotest.py
index 219f4a1..3296cd0 100755
--- a/test/dotest.py
+++ b/test/dotest.py
@@ -832,14 +832,16 @@
os.environ["LLDB_EXEC"] = lldbExec
#print "The 'lldb' from PATH env variable", lldbExec
- if os.path.isdir(os.path.join(base, '.svn')) and which("svn") is not None:
- pipe = subprocess.Popen([which("svn"), "info", base], stdout = subprocess.PIPE)
- svn_info = pipe.stdout.read()
- elif os.path.isdir(os.path.join(base, '.git')) and which("git") is not None:
- pipe = subprocess.Popen([which("git"), "svn", "info", base], stdout = subprocess.PIPE)
- svn_info = pipe.stdout.read()
- if not noHeaders:
- print svn_info
+ # Skip printing svn/git information when running in parsable (lit-test compatibility) mode
+ if not parsable:
+ if os.path.isdir(os.path.join(base, '.svn')) and which("svn") is not None:
+ pipe = subprocess.Popen([which("svn"), "info", base], stdout = subprocess.PIPE)
+ svn_info = pipe.stdout.read()
+ elif os.path.isdir(os.path.join(base, '.git')) and which("git") is not None:
+ pipe = subprocess.Popen([which("git"), "svn", "info", base], stdout = subprocess.PIPE)
+ svn_info = pipe.stdout.read()
+ if not noHeaders:
+ print svn_info
global ignore