Move TUI completion tests to gdb.tui/completion.exp

gdb/testsuite/ChangeLog:
2017-03-08  Pedro Alves  <palves@redhat.com>

	* gdb.base/completion.exp: Move TUI completion tests to ...
	* gdb.tui/completion.exp: ... this new file.

3 files changed, 63 insertions, 37 deletions

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index d385907..f986520 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 2017-03-08  Pedro Alves  <palves@redhat.com>
 
+	* gdb.base/completion.exp: Move TUI completion tests to ...
+	* gdb.tui/completion.exp: ... this new file.
+
+2017-03-08  Pedro Alves  <palves@redhat.com>
+
 	* gdb.base/tui-disasm-long-lines.c,
 	gdb.base/tui-disasm-long-lines.exp, gdb.base/tui-layout.c,
 	gdb.base/tui-layout.exp: Move to ...
diff --git a/gdb/testsuite/gdb.base/completion.exp b/gdb/testsuite/gdb.base/completion.exp
index 4a3ee4b..6597ea7 100644
--- a/gdb/testsuite/gdb.base/completion.exp
+++ b/gdb/testsuite/gdb.base/completion.exp
@@ -940,40 +940,3 @@ gdb_test_multiple "" "$test" {
 	pass "$test"
     }
 }
-
-gdb_test_no_output "set max-completions unlimited"
-
-if {![skip_tui_tests] && ![target_info exists gdb,nointerrupts]} {
-    set test "test completion of layout names"
-    send_gdb "layout\t\t\t"
-    gdb_test_multiple "" "$test" {
-	-re "asm *next *prev *regs *split *src *\r\n$gdb_prompt layout $" {
-	    pass "$test"
-	}
-    }
-    send_gdb "\003"
-    set test "quit command input after testing layout completion"
-    gdb_test_multiple "" "$test" {
-	-re "$gdb_prompt $" {
-	    pass "$test"
-	}
-    }
-}
-if {![skip_tui_tests] && ![target_info exists gdb,nointerrupts]} {
-    with_test_prefix "focus command" {
-	set test "test completion"
-	send_gdb "focus \t\t"
-	gdb_test_multiple "" "$test" {
-	    -re "cmd *next *prev *src *\r\n$gdb_prompt focus $" {
-		pass "$test"
-	    }
-	}
-	send_gdb "\003"
-	set test "quit command input after testing completion"
-	gdb_test_multiple "" "$test" {
-	    -re "$gdb_prompt $" {
-		pass "$test"
-	    }
-	}
-    }
-}
diff --git a/gdb/testsuite/gdb.tui/completion.exp b/gdb/testsuite/gdb.tui/completion.exp
new file mode 100644
index 0000000..ac5d5f2
--- /dev/null
+++ b/gdb/testsuite/gdb.tui/completion.exp
@@ -0,0 +1,58 @@
+# Copyright 2015-2017 Free Software Foundation, Inc.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+gdb_exit
+gdb_start
+
+if {[skip_tui_tests] || [target_info exists gdb,nointerrupts]} {
+    return
+}
+
+gdb_test_no_output "set max-completions unlimited"
+
+with_test_prefix "completion of layout names" {
+    set test "tab completion"
+    send_gdb "layout\t\t\t"
+    gdb_test_multiple "" "$test" {
+	-re "asm *next *prev *regs *split *src *\r\n$gdb_prompt layout $" {
+	    pass "$test"
+	}
+    }
+    send_gdb "\003"
+    set test "quit command input"
+    gdb_test_multiple "" "$test" {
+	-re "$gdb_prompt $" {
+	    pass "$test"
+	}
+    }
+}
+
+with_test_prefix "completion of focus command" {
+    set test "tab completion"
+    send_gdb "focus \t\t"
+    gdb_test_multiple "" "$test" {
+	-re "cmd *next *prev *src *\r\n$gdb_prompt focus $" {
+	    pass "$test"
+	}
+    }
+
+    send_gdb "\003"
+    set test "quit command input"
+    gdb_test_multiple "" "$test" {
+	-re "$gdb_prompt $" {
+	    pass "$test"
+	}
+    }
+}