Add two utility functions:
o get_parent_frame(frame)
o get_args_as_string(frame)
to lldbutil.py and create TestFrameUtils.py to exercise the utils.
Plus re-arrange the test/python_api/lldbutil to have three directories
for testing iteration, process stack traces, and the just added frame utils.
llvm-svn: 131213
diff --git a/lldb/test/python_api/lldbutil/frame/Makefile b/lldb/test/python_api/lldbutil/frame/Makefile
new file mode 100644
index 0000000..69b74b5
--- /dev/null
+++ b/lldb/test/python_api/lldbutil/frame/Makefile
@@ -0,0 +1,6 @@
+LEVEL = ../../../make
+
+C_SOURCES := main.c
+MAKE_DSYM :=NO
+
+include $(LEVEL)/Makefile.rules
diff --git a/lldb/test/python_api/lldbutil/frame/TestFrameUtils.py b/lldb/test/python_api/lldbutil/frame/TestFrameUtils.py
new file mode 100644
index 0000000..cd4ba09
--- /dev/null
+++ b/lldb/test/python_api/lldbutil/frame/TestFrameUtils.py
@@ -0,0 +1,62 @@
+"""
+Test utility functions for the frame object.
+"""
+
+import os
+import unittest2
+import lldb
+from lldbtest import *
+
+class FrameUtilsTestCase(TestBase):
+
+ mydir = "python_api/lldbutil/frame"
+
+ def setUp(self):
+ # Call super's setUp().
+ TestBase.setUp(self)
+ # Find the line number to break inside main().
+ self.line = line_number('main.c',
+ "// Find the line number here.")
+
+ def test_frame_utils(self):
+ """Test utility functions for the frame object."""
+ self.buildDefault(dictionary={'C_SOURCES': 'main.c'})
+ self.frame_utils()
+
+ def frame_utils(self):
+ exe = os.path.join(os.getcwd(), "a.out")
+
+ target = self.dbg.CreateTarget(exe)
+ self.assertTrue(target.IsValid(), VALID_TARGET)
+
+ breakpoint = target.BreakpointCreateByLocation("main.c", self.line)
+ self.assertTrue(breakpoint.IsValid(), VALID_BREAKPOINT)
+
+ # Now launch the process, and do not stop at entry point.
+ self.process = target.LaunchSimple(None, None, os.getcwd())
+
+ if not self.process.IsValid():
+ self.fail("SBTarget.LaunchProcess() failed")
+ self.assertTrue(self.process.GetState() == lldb.eStateStopped,
+ PROCESS_STOPPED)
+
+ import lldbutil
+ thread = lldbutil.get_stopped_thread(self.process, lldb.eStopReasonBreakpoint)
+ frame0 = thread.GetFrameAtIndex(0)
+ frame1 = thread.GetFrameAtIndex(1)
+ parent = lldbutil.get_parent_frame(frame0)
+ self.assertTrue(parent.IsValid() and parent.GetFrameID() == frame1.GetFrameID())
+ frame0_args = lldbutil.get_args_as_string(frame0)
+ parent_args = lldbutil.get_args_as_string(parent)
+ self.assertTrue(frame0_args and parent_args)
+ if self.TraceOn():
+ lldbutil.print_stacktrace(thread)
+ print "Current frame: %s" % frame0_args
+ print "Parent frame: %s" % parent_args
+
+
+if __name__ == '__main__':
+ import atexit
+ lldb.SBDebugger.Initialize()
+ atexit.register(lambda: lldb.SBDebugger.Terminate())
+ unittest2.main()
diff --git a/lldb/test/python_api/lldbutil/frame/main.c b/lldb/test/python_api/lldbutil/frame/main.c
new file mode 100644
index 0000000..e6eeef5
--- /dev/null
+++ b/lldb/test/python_api/lldbutil/frame/main.c
@@ -0,0 +1,47 @@
+//===-- main.c --------------------------------------------------*- C++ -*-===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+#include <stdio.h>
+
+int a(int);
+int b(int);
+int c(int);
+
+int a(int val)
+{
+ if (val <= 1)
+ return b(val);
+ else if (val >= 3)
+ return c(val);
+
+ return val;
+}
+
+int b(int val)
+{
+ return c(val);
+}
+
+int c(int val)
+{
+ return val + 3; // Find the line number here.
+}
+
+int main (int argc, char const *argv[])
+{
+ int A1 = a(1); // a(1) -> b(1) -> c(1)
+ printf("a(1) returns %d\n", A1);
+
+ int B2 = b(2); // b(2) -> c(2)
+ printf("b(2) returns %d\n", B2);
+
+ int A3 = a(3); // a(3) -> c(3)
+ printf("a(3) returns %d\n", A3);
+
+ return 0;
+}
diff --git a/lldb/test/python_api/lldbutil/Makefile b/lldb/test/python_api/lldbutil/iter/Makefile
similarity index 76%
rename from lldb/test/python_api/lldbutil/Makefile
rename to lldb/test/python_api/lldbutil/iter/Makefile
index 86af2f4..312d3fe 100644
--- a/lldb/test/python_api/lldbutil/Makefile
+++ b/lldb/test/python_api/lldbutil/iter/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
CXX_SOURCES := main.cpp
MAKE_DSYM :=NO
diff --git a/lldb/test/python_api/lldbutil/TestLLDBIterator.py b/lldb/test/python_api/lldbutil/iter/TestLLDBIterator.py
similarity index 98%
rename from lldb/test/python_api/lldbutil/TestLLDBIterator.py
rename to lldb/test/python_api/lldbutil/iter/TestLLDBIterator.py
index 51e852e..568048b 100644
--- a/lldb/test/python_api/lldbutil/TestLLDBIterator.py
+++ b/lldb/test/python_api/lldbutil/iter/TestLLDBIterator.py
@@ -10,7 +10,7 @@
class LLDBIteratorTestCase(TestBase):
- mydir = "python_api/lldbutil"
+ mydir = "python_api/lldbutil/iter"
def setUp(self):
# Call super's setUp().
diff --git a/lldb/test/python_api/lldbutil/TestRegistersIterator.py b/lldb/test/python_api/lldbutil/iter/TestRegistersIterator.py
similarity index 98%
rename from lldb/test/python_api/lldbutil/TestRegistersIterator.py
rename to lldb/test/python_api/lldbutil/iter/TestRegistersIterator.py
index ade237e..bd20b7e 100644
--- a/lldb/test/python_api/lldbutil/TestRegistersIterator.py
+++ b/lldb/test/python_api/lldbutil/iter/TestRegistersIterator.py
@@ -10,7 +10,7 @@
class RegistersIteratorTestCase(TestBase):
- mydir = "python_api/lldbutil"
+ mydir = "python_api/lldbutil/iter"
def setUp(self):
# Call super's setUp().
diff --git a/lldb/test/python_api/lldbutil/main.cpp b/lldb/test/python_api/lldbutil/iter/main.cpp
similarity index 100%
rename from lldb/test/python_api/lldbutil/main.cpp
rename to lldb/test/python_api/lldbutil/iter/main.cpp
diff --git a/lldb/test/python_api/lldbutil/Makefile b/lldb/test/python_api/lldbutil/process/Makefile
similarity index 76%
copy from lldb/test/python_api/lldbutil/Makefile
copy to lldb/test/python_api/lldbutil/process/Makefile
index 86af2f4..312d3fe 100644
--- a/lldb/test/python_api/lldbutil/Makefile
+++ b/lldb/test/python_api/lldbutil/process/Makefile
@@ -1,4 +1,4 @@
-LEVEL = ../../make
+LEVEL = ../../../make
CXX_SOURCES := main.cpp
MAKE_DSYM :=NO
diff --git a/lldb/test/python_api/lldbutil/TestPrintStackTraces.py b/lldb/test/python_api/lldbutil/process/TestPrintStackTraces.py
similarity index 97%
rename from lldb/test/python_api/lldbutil/TestPrintStackTraces.py
rename to lldb/test/python_api/lldbutil/process/TestPrintStackTraces.py
index cdd8c41..32ff8ac 100644
--- a/lldb/test/python_api/lldbutil/TestPrintStackTraces.py
+++ b/lldb/test/python_api/lldbutil/process/TestPrintStackTraces.py
@@ -10,7 +10,7 @@
class ThreadsStackTracesTestCase(TestBase):
- mydir = "python_api/lldbutil"
+ mydir = "python_api/lldbutil/process"
def setUp(self):
# Call super's setUp().
diff --git a/lldb/test/python_api/lldbutil/main.cpp b/lldb/test/python_api/lldbutil/process/main.cpp
similarity index 100%
copy from lldb/test/python_api/lldbutil/main.cpp
copy to lldb/test/python_api/lldbutil/process/main.cpp