summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lldb/test/abbreviation_tests/TestAbbreviations.py9
-rw-r--r--lldb/test/class_types/TestClassTypesDisassembly.py5
-rwxr-xr-xlldb/test/dotest.py4
3 files changed, 14 insertions, 4 deletions
diff --git a/lldb/test/abbreviation_tests/TestAbbreviations.py b/lldb/test/abbreviation_tests/TestAbbreviations.py
index da58ee05b5e..95cbb1c82b4 100644
--- a/lldb/test/abbreviation_tests/TestAbbreviations.py
+++ b/lldb/test/abbreviation_tests/TestAbbreviations.py
@@ -57,6 +57,15 @@ class AbbreviationsTestCase(TestBase):
self.expect("set sh prompt",
startstr = 'prompt (string) = "(lldb) "')
+ # We don't want to display the stdout if not in TraceOn() mode.
+ if not self.TraceOn():
+ old_stdout = sys.stdout
+ session = StringIO.StringIO()
+ sys.stdout = session
+ def restore_stdout():
+ sys.stdout = old_stdout
+ self.addTearDownHook(restore_stdout)
+
self.runCmd (r'''sc print "\n\n\tHello!\n"''')
diff --git a/lldb/test/class_types/TestClassTypesDisassembly.py b/lldb/test/class_types/TestClassTypesDisassembly.py
index 7908fab4432..e6e9e1fd08a 100644
--- a/lldb/test/class_types/TestClassTypesDisassembly.py
+++ b/lldb/test/class_types/TestClassTypesDisassembly.py
@@ -97,8 +97,9 @@ class IterateFrameAndDisassembleTestCase(TestBase):
frame = thread.GetFrameAtIndex(i)
function = frame.GetFunction()
# Print the function header.
- print
- print function
+ if self.traceOn():
+ print
+ print function
if function.IsValid():
# Get all instructions for this function and print them out.
insts = function.GetInstructions(target)
diff --git a/lldb/test/dotest.py b/lldb/test/dotest.py
index 374fc8ad490..223b7ad1653 100755
--- a/lldb/test/dotest.py
+++ b/lldb/test/dotest.py
@@ -181,8 +181,8 @@ where options:
-s : specify the name of the dir created to store the session files of tests
with errored or failed status; if not specified, the test driver uses the
timestamp as the session dir name
--t : trace lldb command execution and result
--v : do verbose mode of unittest framework
+-t : turn on tracing of lldb command and other detailed test executions
+-v : do verbose mode of unittest framework (print out each test case invocation)
-w : insert some wait time (currently 0.5 sec) between consecutive test cases
-# : Repeat the test suite for a specified number of times
OpenPOWER on IntegriCloud