4 files changed, 63 insertions, 54 deletions

diff --git a/lldb/test/class_types/TestClassTypes.py b/lldb/test/class_types/TestClassTypes.py
index 53242d59d90..7dc5bb1e5b2 100644
--- a/lldb/test/class_types/TestClassTypes.py
+++ b/lldb/test/class_types/TestClassTypes.py
@@ -115,7 +115,7 @@ class ClassTypesTestCase(TestBase):
         if self.process.GetState() != lldb.eStateStopped:
             self.fail("Process should be in the 'Stopped' state, "
                       "instead the actual state is: '%s'" %
-                      StateTypeString(self.process.GetState()))
+                      lldbutil.StateTypeString(self.process.GetState()))
 
         # The stop reason of the thread should be breakpoint.
         thread = self.process.GetThreadAtIndex(0)
diff --git a/lldb/test/lldbtest.py b/lldb/test/lldbtest.py
index a313be4b864..3876cae3666 100644
--- a/lldb/test/lldbtest.py
+++ b/lldb/test/lldbtest.py
@@ -165,58 +165,6 @@ def CMD_MSG(str, exe):
         return "'%s' compares successfully" % str
 
 #
-# Returns the stateType string given an enum.
-#
-def StateTypeString(enum):
-    if enum == lldb.eStateInvalid:
-        return "Invalid"
-    elif enum == lldb.eStateUnloaded:
-        return "Unloaded"
-    elif enum == lldb.eStateAttaching:
-        return "Attaching"
-    elif enum == lldb.eStateLaunching:
-        return "Launching"
-    elif enum == lldb.eStateStopped:
-        return "Stopped"
-    elif enum == lldb.eStateRunning:
-        return "Running"
-    elif enum == lldb.eStateStepping:
-        return "Stepping"
-    elif enum == lldb.eStateCrashed:
-        return "Crashed"
-    elif enum == lldb.eStateDetached:
-        return "Detached"
-    elif enum == lldb.eStateExited:
-        return "Exited"
-    elif enum == lldb.eStateSuspended:
-        return "Suspended"
-    else:
-        raise Exception("Unknown stopReason enum")
-
-#
-# Returns the stopReason string given an enum.
-#
-def StopReasonString(enum):
-    if enum == lldb.eStopReasonInvalid:
-        return "Invalid"
-    elif enum == lldb.eStopReasonNone:
-        return "None"
-    elif enum == lldb.eStopReasonTrace:
-        return "Trace"
-    elif enum == lldb.eStopReasonBreakpoint:
-        return "Breakpoint"
-    elif enum == lldb.eStopReasonWatchpoint:
-        return "Watchpoint"
-    elif enum == lldb.eStopReasonSignal:
-        return "Signal"
-    elif enum == lldb.eStopReasonException:
-        return "Exception"
-    elif enum == lldb.eStopReasonPlanComplete:
-        return "PlanComplete"
-    else:
-        raise Exception("Unknown stopReason enum")
-
-#
 # Returns an env variable array from the os.environ map object.
 #
 def EnvArray():
diff --git a/lldb/test/lldbutil.py b/lldb/test/lldbutil.py
index 1e0bcd3ca4a..68fcf8b9392 100644
--- a/lldb/test/lldbutil.py
+++ b/lldb/test/lldbutil.py
@@ -6,6 +6,67 @@ import lldb
 import sys
 import StringIO
 
+########################################################
+#                                                      #
+# Convert some enum value to its string's counterpart. #
+#                                                      #
+########################################################
+
+def StateTypeString(enum):
+    """Returns the stateType string given an enum."""
+    if enum == lldb.eStateInvalid:
+        return "Invalid"
+    elif enum == lldb.eStateUnloaded:
+        return "Unloaded"
+    elif enum == lldb.eStateAttaching:
+        return "Attaching"
+    elif enum == lldb.eStateLaunching:
+        return "Launching"
+    elif enum == lldb.eStateStopped:
+        return "Stopped"
+    elif enum == lldb.eStateRunning:
+        return "Running"
+    elif enum == lldb.eStateStepping:
+        return "Stepping"
+    elif enum == lldb.eStateCrashed:
+        return "Crashed"
+    elif enum == lldb.eStateDetached:
+        return "Detached"
+    elif enum == lldb.eStateExited:
+        return "Exited"
+    elif enum == lldb.eStateSuspended:
+        return "Suspended"
+    else:
+        raise Exception("Unknown stopReason enum")
+
+def StopReasonString(enum):
+    """Returns the stopReason string given an enum."""
+    if enum == lldb.eStopReasonInvalid:
+        return "Invalid"
+    elif enum == lldb.eStopReasonNone:
+        return "None"
+    elif enum == lldb.eStopReasonTrace:
+        return "Trace"
+    elif enum == lldb.eStopReasonBreakpoint:
+        return "Breakpoint"
+    elif enum == lldb.eStopReasonWatchpoint:
+        return "Watchpoint"
+    elif enum == lldb.eStopReasonSignal:
+        return "Signal"
+    elif enum == lldb.eStopReasonException:
+        return "Exception"
+    elif enum == lldb.eStopReasonPlanComplete:
+        return "PlanComplete"
+    else:
+        raise Exception("Unknown stopReason enum")
+
+
+#######################################################
+#                                                     #
+# Utility functions related to Threads and Processes. #
+#                                                     #
+#######################################################
+
 def GetFunctionNames(thread):
     """
     Returns a sequence of function names from the stack frames of this thread.
diff --git a/lldb/test/threads/TestPrintStackTraces.py b/lldb/test/threads/TestPrintStackTraces.py
index ce27ed1f310..18c761d097c 100644
--- a/lldb/test/threads/TestPrintStackTraces.py
+++ b/lldb/test/threads/TestPrintStackTraces.py
@@ -37,7 +37,7 @@ class ThreadsStackTracesTestCase(TestBase):
         if self.process.GetState() != lldb.eStateStopped:
             self.fail("Process should be in the 'Stopped' state, "
                       "instead the actual state is: '%s'" %
-                      StateTypeString(self.process.GetState()))
+                      lldbutil.StateTypeString(self.process.GetState()))
 
         import lldbutil
         lldbutil.PrintStackTraces(self.process)