Centralize the variable display prefs into a new option
group class: OptionGroupVariable. It gets initialized with
a boolean that indicates if the frame specific options are
included so that this can be used in both the "frame variable"
and "target variable" commands.

Removed the global functionality from the "frame variable" 
command. Users should switch to using the "target variable"
command.

llvm-svn: 134594
diff --git a/lldb/test/lang/cpp/class_static/TestStaticVariables.py b/lldb/test/lang/cpp/class_static/TestStaticVariables.py
index 18415b1..9e08fc2 100644
--- a/lldb/test/lang/cpp/class_static/TestStaticVariables.py
+++ b/lldb/test/lang/cpp/class_static/TestStaticVariables.py
@@ -60,9 +60,11 @@
         # On Mac OS X, gcc 4.2 emits the wrong debug info for A::g_points.
         slist = ['(PointType [2]) g_points', 'A::g_points']
 
+# global variables are no longer displayed with the "frame variable" command. 
+# add tests for the "target variable" command soon
         # 'frame variable -G' finds and displays global variable(s) by name.
-        self.expect('frame variable -G g_points', VARIABLES_DISPLAYED_CORRECTLY,
-            substrs = slist)
+        # self.expect('frame variable -G g_points', VARIABLES_DISPLAYED_CORRECTLY,
+        #     substrs = slist)
 
         # A::g_points is an array of two elements.
         if sys.platform.startswith("darwin") and self.getCompiler() in ['clang', 'llvm-gcc']: