[Lldb-commits] [lldb] r191868 - Fixed TestSettings.py to correctly restore the frame format string.

[Richard Mitton]

Author: rmitton
Date: Wed Oct  2 20:50:35 2013
New Revision: 191868

URL: http://llvm.org/viewvc/llvm-project?rev=191868&view=rev
Log:
Fixed TestSettings.py to correctly restore the frame format string.

This fixes TestBreakpointCommand.

Modified:
    lldb/trunk/test/settings/TestSettings.py

Modified: lldb/trunk/test/settings/TestSettings.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/settings/TestSettings.py?rev=191868&r1=191867&r2=191868&view=diff
==============================================================================
--- lldb/trunk/test/settings/TestSettings.py (original)
+++ lldb/trunk/test/settings/TestSettings.py Wed Oct  2 20:50:35 2013
@@ -2,7 +2,7 @@
 Test lldb settings command.
 """
 
-import os, time
+import os, time, re
 import unittest2
 import lldb
 from lldbtest import *
@@ -122,7 +122,11 @@ class SettingsCommandTestCase(TestBase):
         self.addTearDownHook(cleanup)
 
         self.runCmd("settings show frame-format")
-        self.format_string = self.res.GetOutput()
+        m = re.match(
+                '^frame-format \(string\) = "(.*)\"$',
+                self.res.GetOutput())
+        self.assertTrue(m, "Bad settings string")
+        self.format_string = m.group(1)
 
         # Change the default format to print function.name rather than function.name-with-args
         format_string = "frame #${frame.index}: ${frame.pc}{ ${module.file.basename}`${function.name}{${function.pc-offset}}}{ at ${line.file.fullpath}:${line.number}}\n"