summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lldb/test/python_api/lldbutil/Makefile (renamed from lldb/test/threads/Makefile)2
-rw-r--r--lldb/test/python_api/lldbutil/TestPrintStackTraces.py (renamed from lldb/test/threads/TestPrintStackTraces.py)7
-rw-r--r--lldb/test/python_api/lldbutil/main.cpp (renamed from lldb/test/threads/main.cpp)0
3 files changed, 5 insertions, 4 deletions
diff --git a/lldb/test/threads/Makefile b/lldb/test/python_api/lldbutil/Makefile
index 683a3098ac0..86af2f4bc70 100644
--- a/lldb/test/threads/Makefile
+++ b/lldb/test/python_api/lldbutil/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../make
+LEVEL = ../../make
CXX_SOURCES := main.cpp
MAKE_DSYM :=NO
diff --git a/lldb/test/threads/TestPrintStackTraces.py b/lldb/test/python_api/lldbutil/TestPrintStackTraces.py
index a2895fff779..4bd4bda8c33 100644
--- a/lldb/test/threads/TestPrintStackTraces.py
+++ b/lldb/test/python_api/lldbutil/TestPrintStackTraces.py
@@ -1,5 +1,5 @@
"""
-Test SBprocess and SBThread APIs with printing of the stack traces.
+Test SBprocess and SBThread APIs with printing of the stack traces using lldbutil.
"""
import os, time
@@ -10,7 +10,7 @@ from lldbtest import *
class ThreadsStackTracesTestCase(TestBase):
- mydir = "threads"
+ mydir = "python_api/lldbutil"
def setUp(self):
# Call super's setUp().
@@ -46,7 +46,8 @@ class ThreadsStackTracesTestCase(TestBase):
"instead the actual state is: '%s'" %
lldbutil.StateTypeString(self.process.GetState()))
- lldbutil.PrintStackTraces(self.process)
+ if self.TraceOn():
+ lldbutil.PrintStackTraces(self.process)
if __name__ == '__main__':
diff --git a/lldb/test/threads/main.cpp b/lldb/test/python_api/lldbutil/main.cpp
index 0c5fd45388f..0c5fd45388f 100644
--- a/lldb/test/threads/main.cpp
+++ b/lldb/test/python_api/lldbutil/main.cpp
OpenPOWER on IntegriCloud