* breakpoint.c (catch_syscall_completer): Pass 'word' as second

	argument to complete_on_enum.
testsuite
	* gdb.base/catch-syscall.exp (do_syscall_tests): Add completion
	test.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e2a2253..0fc9a86 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
 2012-11-02  Tom Tromey  <tromey@redhat.com>
 
+       * breakpoint.c (catch_syscall_completer): Pass 'word' as second
+       argument to complete_on_enum.
+
+2012-11-02  Tom Tromey  <tromey@redhat.com>
+
        * configure: Rebuild.
        * configure.ac (build_warnings): Add -Wempty-body.
        * m68k-tdep.c (m68k_gdbarch_init): Remove empty 'if'.

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 76e3e89..0023ba5 100644 (file)
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -14972,7 +14972,7 @@ catch_syscall_completer (struct cmd_list_element *cmd,
 {
   const char **list = get_syscall_names ();
   VEC (char_ptr) *retlist
-    = (list == NULL) ? NULL : complete_on_enum (list, text, word);
+    = (list == NULL) ? NULL : complete_on_enum (list, word, word);
 
   xfree (list);
   return retlist;

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 91287e3..e3376d1 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-02  Tom Tromey  <tromey@redhat.com>
+
+       * gdb.base/catch-syscall.exp (do_syscall_tests): Add completion
+       test.
+
 2012-11-02  Pedro Alves  <palves@redhat.com>
 
        PR gdb/14766

diff --git a/gdb/testsuite/gdb.base/catch-syscall.exp b/gdb/testsuite/gdb.base/catch-syscall.exp
index 9054cfe..8aa81e0 100644 (file)
--- a/gdb/testsuite/gdb.base/catch-syscall.exp
+++ b/gdb/testsuite/gdb.base/catch-syscall.exp
@@ -288,6 +288,11 @@ proc do_syscall_tests {} {
     set thistest "catch syscall to a nonsense syscall is prohibited"
     gdb_test "catch syscall nonsense_syscall" "Unknown syscall name .*" $thistest
 
+    # Regression test for syscall completer bug.
+    gdb_test "complete catch syscall close chroo" \
+       "catch syscall close chroot" \
+       "complete catch syscall with multiple words"
+
     # Testing the 'catch syscall' command without arguments.
     # This test should catch any syscalls.
     if [runto_main] then { test_catch_syscall_without_args }