Eliminate redundant Alias test and improve Common Short Spellings test http://review...

llvm-svn: 235790

diff --git a/lldb/test/functionalities/abbreviation/Makefile b/lldb/test/functionalities/abbreviation/Makefile
deleted file mode 100644 (file)
index 8a7102e..0000000
--- a/lldb/test/functionalities/abbreviation/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-LEVEL = ../../make
-
-CXX_SOURCES := main.cpp
-
-include $(LEVEL)/Makefile.rules

diff --git a/lldb/test/functionalities/abbreviation/TestCommonShortSpellings.py b/lldb/test/functionalities/abbreviation/TestCommonShortSpellings.py
index f653e08e7375c88e17bb9c309e2f01b81e967f82..c01a0314a5c893e8ddbbfda419ed9de4e3a53ccc 100644 (file)
--- a/lldb/test/functionalities/abbreviation/TestCommonShortSpellings.py
+++ b/lldb/test/functionalities/abbreviation/TestCommonShortSpellings.py
@@ -1,6 +1,6 @@
 """
 Test some lldb command abbreviations to make sure the common short spellings of
-many commands remain available even after we add/delte commands in the future.
+many commands remain available even after we add/delete commands in the future.
 """
 
 import os, time
@@ -13,54 +13,25 @@ class CommonShortSpellingsTestCase(TestBase):
     
     mydir = TestBase.compute_mydir(__file__)
 
-    @skipUnlessDarwin
-    @dsym_test
-    def test_with_dsym (self):
-        self.buildDsym ()
-        self.run_abbrevs2 ()
-
-    @dwarf_test
-    def test_with_dwarf (self):
-        self.buildDwarf ()
-        self.run_abbrevs2 ()
-
-    def run_abbrevs2 (self):
-        exe = os.path.join (os.getcwd(), "a.out")
-        self.expect("file " + exe,
-                    patterns = [ "Current executable set to .*a.out.*" ])
-
-        # br s -> breakpoint set
-        
-        match_object = lldbutil.run_break_set_command (self, "br s -n sum")
-        lldbutil.check_breakpoint_result (self, match_object, symbol_name='sum', symbol_match_exact=False, num_locations=1)
-
-        self.runCmd("settings set interpreter.expand-regex-aliases true")
-        self.addTearDownHook(
-            lambda: self.runCmd("settings set interpreter.expand-regex-aliases false"))
-        
-        # disp -> display
-        self.expect("disp a",
-            startstr = "target stop-hook add -o")
-        self.expect("disp b",
-            startstr = "target stop-hook add -o")
-
-        # di/dis -> disassemble
-        self.expect("help di",
-            substrs = ["disassemble"])
-        self.expect("help dis",
-            substrs = ["disassemble"])
-
-        # ta st a -> target stop-hook add
-        self.expect("help ta st a",
-            substrs = ["target stop-hook add"])
-
-        # fr v -> frame variable
-        self.expect("help fr v",
-            substrs = ["frame variable"])
-
-        # ta st li -> target stop-hook list
-        self.expect("ta st li",
-            substrs = ["Hook: 1", "Hook: 2"])
+    def test_abbrevs2 (self):
+        command_interpreter = self.dbg.GetCommandInterpreter()
+        self.assertTrue(command_interpreter, VALID_COMMAND_INTERPRETER)
+        result = lldb.SBCommandReturnObject()
+
+        abbrevs = [
+            ('br s', 'breakpoint set'),
+            ('disp', '_regexp-display'),  # a.k.a., 'display'
+            ('di', 'disassemble'),
+            ('dis', 'disassemble'),
+            ('ta st a', 'target stop-hook add'),
+            ('fr v', 'frame variable'),
+            ('ta st li', 'target stop-hook list'),
+        ]
+
+        for (short, long) in abbrevs:
+            command_interpreter.ResolveCommand(short, result)
+            self.assertTrue(result.Succeeded())
+            self.assertEqual(long, result.GetOutput())
 
 
 if __name__ == '__main__':

diff --git a/lldb/test/functionalities/abbreviation/change_prompt.lldb b/lldb/test/functionalities/abbreviation/change_prompt.lldb
deleted file mode 100644 (file)
index 116db1d..0000000
--- a/lldb/test/functionalities/abbreviation/change_prompt.lldb
+++ /dev/null
@@ -1 +0,0 @@
-settings set prompt "[with-three-trailing-spaces]   "
\ No newline at end of file

diff --git a/lldb/test/functionalities/abbreviation/main.cpp b/lldb/test/functionalities/abbreviation/main.cpp
deleted file mode 100644 (file)
index 7af4e3d..0000000
--- a/lldb/test/functionalities/abbreviation/main.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include <cstdlib>
-#include <string>
-#include <fstream>
-#include <iostream>
-
-int
-product (int x, int y)
-{
-    int result = x * y;
-    return result;
-}
-
-int
-sum (int a, int b)
-{
-    int result = a + b;
-    return result;
-}
-
-int
-strange_max (int m, int n)
-{
-    if (m > n)
-        return m;
-    else if (n > m)
-        return n;
-    else
-        return 0;
-}
-
-int
-foo (int i, int j)
-{
-    if (strange_max (i, j) == i)
-        return product (i, j);
-    else if (strange_max  (i, j) == j)
-        return sum (i, j);
-    else
-        return product (sum (i, i), sum (j, j));
-}
-
-int
-main(int argc, char const *argv[])
-{
-
-    int array[3];
-
-    array[0] = foo (1238, 78392);
-    array[1] = foo (379265, 23674);
-    array[2] = foo (872934, 234);
-
-    return 0;
-}

diff --git a/lldb/test/functionalities/alias/Makefile b/lldb/test/functionalities/alias/Makefile
deleted file mode 100644 (file)
index 8a7102e..0000000
--- a/lldb/test/functionalities/alias/Makefile
+++ /dev/null
@@ -1,5 +0,0 @@
-LEVEL = ../../make
-
-CXX_SOURCES := main.cpp
-
-include $(LEVEL)/Makefile.rules

diff --git a/lldb/test/functionalities/alias/TestAliases.py b/lldb/test/functionalities/alias/TestAliases.py
deleted file mode 100644 (file)
index 92251e5..0000000
--- a/lldb/test/functionalities/alias/TestAliases.py
+++ /dev/null
@@ -1,166 +0,0 @@
-"""
-Test lldb command aliases.
-"""
-
-import os, time
-import unittest2
-import lldb
-from lldbtest import *
-import lldbutil
-
-class AliasTestCase(TestBase):
-
-    mydir = TestBase.compute_mydir(__file__)
-
-    @skipUnlessDarwin
-    @dsym_test
-    def test_with_dsym (self):
-        self.buildDsym ()
-        self.alias_tests ()
-
-    @dwarf_test
-    def test_with_dwarf (self):
-        self.buildDwarf ()
-        self.alias_tests ()
-
-    def alias_tests (self):
-        exe = os.path.join (os.getcwd(), "a.out")
-        self.expect("file " + exe,
-                    patterns = [ "Current executable set to .*a.out" ])
-
-
-        def cleanup():
-            self.runCmd('command unalias hello', check=False)
-            self.runCmd('command unalias python', check=False)
-            self.runCmd('command unalias pp', check=False)
-            self.runCmd('command unalias alias', check=False)
-            self.runCmd('command unalias unalias', check=False)
-            self.runCmd('command unalias myrun', check=False)
-            self.runCmd('command unalias bp', check=False)
-            self.runCmd('command unalias bpa', check=False)
-            self.runCmd('command unalias bpi', check=False)
-            self.runCmd('command unalias bfl', check=False)
-            self.runCmd('command unalias exprf', check=False)
-            self.runCmd('command unalias exprf2', check=False)
-
-        # Execute the cleanup function during test case tear down.
-        self.addTearDownHook(cleanup)
-
-        self.runCmd (r'''command alias hello expr (int) printf ("\n\nHello, anybody!\n\n")''')
-
-        self.runCmd ("command alias python script")
-
-        # We don't want to display the stdout if not in TraceOn() mode.
-        if not self.TraceOn():
-            self.HideStdout()
-
-        self.runCmd (r'''python print "\n\n\nWhoopee!\n\n\n"''')
-#        self.expect (r'''python print "\n\n\nWhoopee!\n\n\n"''',
-#                     substrs = [ "Whoopee!" ])
-
-        self.runCmd (r'''python print "\n\t\x68\x65\x6c\x6c\x6f\n"''')
-#        self.expect (r'''python print "\n\t\x68\x65\x6c\x6c\x6f\n"''',
-#                     substrs = [ "hello" ])
-
-        self.runCmd (r'''command alias pp python print "\n\t\x68\x65\x6c\x6c\x6f\n"''')
-        self.runCmd ("pp")
-#        self.expect ("pp",
-#                     substrs = [ "hello" ])
-
-
-        self.runCmd ("command alias alias command alias")
-        self.runCmd ("command alias unalias command unalias")
-
-        self.runCmd ("alias myrun process launch -t %1 --")
-        self.runCmd ("alias bp breakpoint")
-
-        self.expect ("alias bpa bp add",
-                     COMMAND_FAILED_AS_EXPECTED, error = True,
-                     substrs = [ "'add' is not a valid sub-command of 'bp'" ])
-
-        self.runCmd ("alias bpa bp command add")
-        self.runCmd ("alias bpi bp list")
-
-        break_results = lldbutil.run_break_set_command (self, "bp set -n foo")
-        lldbutil.check_breakpoint_result (self, break_results, num_locations=1, symbol_name='foo', symbol_match_exact=False)
-
-        break_results = lldbutil.run_break_set_command (self, "bp set -n sum")
-        lldbutil.check_breakpoint_result (self, break_results, num_locations=1, symbol_name='sum', symbol_match_exact=False)
-
-        self.runCmd ("alias bfl bp set -f %1 -l %2")
-
-        break_results = lldbutil.run_break_set_command (self, "bfl main.cpp 32")
-        lldbutil.check_breakpoint_result (self, break_results, num_locations=1, file_name='main.cpp', line_number=32)
-
-        self.expect ("bpi",
-                     startstr = "Current breakpoints:",
-                     substrs = [ "1: name = 'foo', locations = 1",
-                                 "2: name = 'sum', locations = 1",
-                                 "3: file = 'main.cpp', line = 32, locations = 1" ])
-
-        self.runCmd ("bpa -s python 1 -o 'print frame; print bp_loc'")
-        self.runCmd ("bpa -s command 2 -o 'frame variable b'")
-        self.expect ("bpi -f",
-                     substrs = [ "Current breakpoints:",
-                                 "1: name = 'foo', locations = 1",
-                                 "print frame; print bp_loc",
-                                 "2: name = 'sum', locations = 1",
-                                 "frame variable b" ])
-
-
-        self.expect ("help run",
-                     substrs = [ "'run' is an abbreviation for 'process launch -c /bin/sh --'" ])
-
-        self.expect ("help -a run",
-                     substrs = [ "'run' is an abbreviation for 'process launch -c /bin/sh --'" ])
-
-        self.expect ("help",
-                     substrs = [ 'run', 'process launch -c /bin/sh' ])
-
-        self.expect ("help -a", matching=False,
-                     substrs = [ "'run'", 'process launch -c /bin/sh' ])
-
-        self.expect ("run",
-                     patterns = [ "Process .* launched: .*a.out" ])
-
-        self.expect (r'''expression (int) printf("\x68\x65\x6c\x6c\x6f\n")''',
-                     substrs = [ "(int) $",
-                                 "= 6" ])
-
-        self.expect ("hello",
-                     substrs = [ "(int) $", 
-                                 "= 19" ])
-
-        self.expect ("expr -f x -- 68",
-                     substrs = [ "(int) $",
-                                 "= 0x00000044" ])
-
-        self.runCmd ("alias exprf expr -f %1")
-        self.runCmd ("alias exprf2 expr --raw -f %1 --")
-        self.expect ("exprf x -- 1234",
-                     substrs = [ "(int) $",
-                                 "= 0x000004d2" ])
-
-        self.expect ('exprf2 c "Hi there!"',
-                     substrs = [ "[0] = 'H'",
-                                 "[1] = 'i'",
-                                 "[2] = ' '",
-                                 "[3] = 't'",
-                                 "[4] = 'h'",
-                                 "[5] = 'e'",
-                                 "[6] = 'r'",
-                                 "[7] = 'e'",
-                                 "[8] = '!'",
-                                 "[9] = '\\0'" ])
-        
-
-        self.expect ("exprf x 1234",
-                     COMMAND_FAILED_AS_EXPECTED, error = True,
-                     substrs = [ "1 errors parsing expression" ])
-
-if __name__ == '__main__':
-    import atexit
-    lldb.SBDebugger.Initialize()
-    atexit.register(lambda: lldb.SBDebugger.Terminate())
-    unittest2.main()
-

diff --git a/lldb/test/functionalities/alias/main.cpp b/lldb/test/functionalities/alias/main.cpp
deleted file mode 100644 (file)
index 7af4e3d..0000000
--- a/lldb/test/functionalities/alias/main.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-//===-- main.cpp ------------------------------------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-
-#include <cstdlib>
-#include <string>
-#include <fstream>
-#include <iostream>
-
-int
-product (int x, int y)
-{
-    int result = x * y;
-    return result;
-}
-
-int
-sum (int a, int b)
-{
-    int result = a + b;
-    return result;
-}
-
-int
-strange_max (int m, int n)
-{
-    if (m > n)
-        return m;
-    else if (n > m)
-        return n;
-    else
-        return 0;
-}
-
-int
-foo (int i, int j)
-{
-    if (strange_max (i, j) == i)
-        return product (i, j);
-    else if (strange_max  (i, j) == j)
-        return sum (i, j);
-    else
-        return product (sum (i, i), sum (j, j));
-}
-
-int
-main(int argc, char const *argv[])
-{
-
-    int array[3];
-
-    array[0] = foo (1238, 78392);
-    array[1] = foo (379265, 23674);
-    array[2] = foo (872934, 234);
-
-    return 0;
-}