Updated test case to "settings set prompt 'lldb2'" since the '-o' option is gone.
Also added "settings set -r prompt" to reset the prompt afterwards.

llvm-svn: 114846
diff --git a/lldb/test/settings/TestSettings.py b/lldb/test/settings/TestSettings.py
index 9a43f12..9cd3f48 100644
--- a/lldb/test/settings/TestSettings.py
+++ b/lldb/test/settings/TestSettings.py
@@ -19,8 +19,8 @@
     def test_set_prompt(self):
         """Test that 'set prompt' actually changes the prompt."""
 
-        # Use '-o' option to override the existing instance setting.
-        self.runCmd("settings set -o prompt 'lldb2'")
+        # Set prompt to 'lldb2'.
+        self.runCmd("settings set prompt 'lldb2'")
 
         # Immediately test the setting.
         self.expect("settings show prompt",
@@ -30,6 +30,9 @@
         self.expect("settings show",
             substrs = ["prompt (string) = 'lldb2'"])
 
+        # Use '-r' option to reset to the original default prompt.
+        self.runCmd("settings set -r prompt")
+
     def test_set_term_width(self):
         """Test that 'set term-width' actually changes the term-width."""