From: Yao Qi <yao@codesourcery.com>
To: <gdb-patches@sourceware.org>
Subject: [PATCH 04/11] mi-basics.exp
Date: Fri, 28 Sep 2012 00:05:00 -0000 [thread overview]
Message-ID: <1348790666-2544-5-git-send-email-yao@codesourcery.com> (raw)
In-Reply-To: <1348790666-2544-1-git-send-email-yao@codesourcery.com>
gdb/testsuite:
2012-09-27 Yao Qi <yao@codesourcery.com>
* gdb.mi/mi-basics.exp: Remove.
* gdb.mi/mi2-basics.exp: Invoke mi_gdb_start with
separate-inferior-tty.
(test_path_specification): New.
---
gdb/testsuite/gdb.mi/mi-basics.exp | 265 -----------------------------------
gdb/testsuite/gdb.mi/mi2-basics.exp | 41 ++++++-
2 files changed, 40 insertions(+), 266 deletions(-)
delete mode 100644 gdb/testsuite/gdb.mi/mi-basics.exp
diff --git a/gdb/testsuite/gdb.mi/mi-basics.exp b/gdb/testsuite/gdb.mi/mi-basics.exp
deleted file mode 100644
index 564b835..0000000
--- a/gdb/testsuite/gdb.mi/mi-basics.exp
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 1999-2003, 2005, 2007-2012 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/>.
-
-#
-# test basic Machine interface (MI) operations
-#
-# Verify that, using the MI, we can load a program and do
-# other basic things that are used by all test files through mi_gdb_exit,
-# mi_gdb_start, mi_delete_breakpoints, mi_gdb_reinitialize_dir and
-# mi_gdb_load, so we can safely use those.
-#
-# The goal is not to test gdb functionality, which is done by other tests,
-# but the command syntax and correct output response to MI operations.
-#
-
-load_lib mi-support.exp
-set MIFLAGS "-i=mi"
-
-gdb_exit
-if [mi_gdb_start separate-inferior-tty] {
- continue
-}
-
-standard_testfile basics.c
-set escapedobjdir [string_to_regexp ${objdir}]
-set envirodir [string_to_regexp ${objdir}/${subdir}]
-
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
- untested mi-basics.exp
- return -1
-}
-
-# In this file we want to test if the operations needed by the following
-# procedures work, so it makes no sense using them here.
-
-# mi_delete_breakpoints
-# mi_gdb_reinitialize_dir $srcdir/$subdir
-# mi_gdb_load ${binfile}
-
-# Test if the MI interpreter has been configured
-
-proc test_mi_interpreter_selection {} {
- global mi_gdb_prompt
- global gdb_prompt
-
- # All this test expects is to get the prompt back
- # with no syntax error message
- if ![mi_gdb_test "-gdb-version" "~\"GNU gdb.*" "acceptance of MI operations"] {
- return 1
- }
-
- note "Skipping all other MI tests."
- return 0
-}
-
-proc test_exec_and_symbol_mi_operatons {} {
- global mi_gdb_prompt
- global binfile
-
- # Load symbols and specify executable on a single operation
- # Tests:
- # -file-exec-and-symbols
-
- if [mi_gdb_test "-file-exec-and-symbols ${binfile}" "\\\^done" \
- "file-exec-and-symbols operation"] {
- note "Skipping all other MI tests."
- return 0
- }
-
- # The following is not used by mi-support.exp, but we test here so
- # we get done with loading a program basics.
-
- # Do it again, but now load symbols and specify executable with
- # two separate operations
- # Tests:
- # -file-clear
- # -file-exec-file
- # -file-symbol-file
-
- # FIXME: file-clear is not implemented yet.
-# mi_gdb_test "-file-clear" \
-# "\\\^done" \
-# "file-clear operation"
-
- mi_gdb_test "-file-exec-file ${binfile}" \
- "\\\^done" \
- "file-exec-file operation"
-
- mi_gdb_test "-file-symbol-file ${binfile}" \
- "\\\^done" \
- "file-symbol-file operation"
-
- # We need to return != 0.
- return 1
-}
-
-proc test_breakpoints_deletion {} {
- global mi_gdb_prompt
- global srcfile
-
- # Clear all breakpoints and list to confirm
- # Tests:
- # -break-delete (all)
- # -break-list
-
- # The all parameter is actually no parameter.
- mi_gdb_test "200-break-delete" \
- "200\\\^done" \
- "break-delete (all) operation"
-
- mi_gdb_test "201-break-list" \
- ".*\\\^done,BreakpointTable=\\\{.*,body=\\\[\\\]\\\}" \
- "all breakpoints removed"
-}
-
-proc test_dir_specification {} {
- global mi_gdb_prompt
- global objdir
- global subdir
- global envirodir
-
- # Add to the search directories, display, then reset back to default
- # Tests:
- # -environment-directory arg
- # -environment-directory
- # -environment-directory -r
-
- mi_gdb_test "202-environment-directory ${objdir}/${subdir}" \
- "202\\\^done,source-path=\"${envirodir}.\\\$cdir.\\\$cwd\"" \
- "environment-directory arg operation"
-
- mi_gdb_test "203-environment-directory" \
- "203\\\^done,source-path=\"${envirodir}.\\\$cdir.\\\$cwd\"" \
- "environment-directory empty-string operation"
-
- mi_gdb_test "204-environment-directory -r" \
- "204\\\^done,source-path=\"\\\$cdir.\\\$cwd\"" \
- "environment-directory operation"
-}
-
-proc test_cwd_specification {} {
- global mi_gdb_prompt
- global objdir
- global escapedobjdir
- global subdir
-
- # Change the working directory, then print the current working directory
- # Tests:
- # -environment-cd ${objdir}
- # -environment-pwd
-
- mi_gdb_test "205-environment-cd ${objdir}" \
- "205\\\^done" \
- "environment-cd arg operation"
-
- # The canonical name of the working directory may differ on a
- # remote host from that on the build system.
- if ![is_remote host] {
- mi_gdb_test "206-environment-pwd" \
- "206\\\^done,cwd=\"${escapedobjdir}\"" \
- "environment-pwd operation"
- }
-}
-
-proc test_path_specification {} {
- global mi_gdb_prompt
- global orig_path
- global objdir
- global subdir
- global escapedobjdir
- global envirodir
- global expect_out
-
- # Add to the path, display, then reset
- # Tests:
- # -environment-path
- # -environment-path dir1 dir2
- # -environment-path -r dir
- # -environment-path -r
-
- mi_gdb_test "-environment-path" "\\\^done,path=\"(.*)\"" "environment-path"
- set orig_path $expect_out(3,string)
-
- set orig_path [string_to_regexp ${orig_path}]
- set pathdir [string_to_regexp ${objdir}/${subdir}]
-
- mi_gdb_test "207-environment-path" \
- "207\\\^done,path=\"$orig_path\"" \
- "environment-path no-args operation"
-
- mi_gdb_test "208-environment-path $objdir ${objdir}/${subdir}" \
- "208\\\^done,path=\"$escapedobjdir.${envirodir}.$orig_path\"" \
- "environment-path dir1 dir2 operation"
-
- mi_gdb_test "209-environment-path -r $objdir" \
- "209\\\^done,path=\"$escapedobjdir.$orig_path\"" \
- "environment-path -r dir operation"
-
- mi_gdb_test "210-environment-path -r" \
- "210\\\^done,path=\"$orig_path\"" \
- "environment-path -r operation"
-
-}
-
-proc test_setshow_inferior_tty {} {
- global mi_gdb_prompt
- global mi_inferior_tty_name
-
- # Test that the commands,
- # -inferior-tty-set
- # -inferior-tty-show
- # are setting/getting the same data in GDB.
-
- mi_gdb_test "301-inferior-tty-show" \
- "301\\\^done,inferior_tty_terminal=\"$mi_inferior_tty_name\"" \
- "initial tty is mi_inferior_tty_name"
-
- mi_gdb_test "302-inferior-tty-set /dev/pts/1" \
- "302\\\^done" \
- "set tty to /dev/pts/1"
-
- mi_gdb_test "303-inferior-tty-show" \
- "303\\\^done,inferior_tty_terminal=\"/dev/pts/1\"" \
- "tty was set correctly"
-
- mi_gdb_test "304-inferior-tty-set" \
- "304\\\^done" \
- "set tty to the empty string"
-
- mi_gdb_test "305-inferior-tty-show" \
- "305\\\^done" \
- "make sure tty is empty"
-
- mi_gdb_test "306-inferior-tty-set $mi_inferior_tty_name" \
- "306\\\^done" \
- "set tty to mi_inferior_tty_name (the way it was)"
-
- mi_gdb_test "307-inferior-tty-show" \
- "307\\\^done,inferior_tty_terminal=\"$mi_inferior_tty_name\"" \
- "verify tty is correct"
-}
-
-if { [test_mi_interpreter_selection]
- && [test_exec_and_symbol_mi_operatons] } {
- test_breakpoints_deletion
- test_dir_specification
- test_cwd_specification
- test_path_specification
- test_setshow_inferior_tty
-}
-
-mi_gdb_exit
-return 0
diff --git a/gdb/testsuite/gdb.mi/mi2-basics.exp b/gdb/testsuite/gdb.mi/mi2-basics.exp
index 3a54f99..179a7d5 100644
--- a/gdb/testsuite/gdb.mi/mi2-basics.exp
+++ b/gdb/testsuite/gdb.mi/mi2-basics.exp
@@ -29,7 +29,7 @@ load_lib mi-support.exp
set MIFLAGS "-i=mi2"
gdb_exit
-if [mi_gdb_start] {
+if [mi_gdb_start separate-inferior-tty] {
continue
}
@@ -217,12 +217,51 @@ proc test_path_specification {} {
}
+proc test_setshow_inferior_tty {} {
+ global mi_gdb_prompt
+ global mi_inferior_tty_name
+
+ # Test that the commands,
+ # -inferior-tty-set
+ # -inferior-tty-show
+ # are setting/getting the same data in GDB.
+
+ mi_gdb_test "301-inferior-tty-show" \
+ "301\\\^done,inferior_tty_terminal=\"$mi_inferior_tty_name\"" \
+ "initial tty is mi_inferior_tty_name"
+
+ mi_gdb_test "302-inferior-tty-set /dev/pts/1" \
+ "302\\\^done" \
+ "set tty to /dev/pts/1"
+
+ mi_gdb_test "303-inferior-tty-show" \
+ "303\\\^done,inferior_tty_terminal=\"/dev/pts/1\"" \
+ "tty was set correctly"
+
+ mi_gdb_test "304-inferior-tty-set" \
+ "304\\\^done" \
+ "set tty to the empty string"
+
+ mi_gdb_test "305-inferior-tty-show" \
+ "305\\\^done" \
+ "make sure tty is empty"
+
+ mi_gdb_test "306-inferior-tty-set $mi_inferior_tty_name" \
+ "306\\\^done" \
+ "set tty to mi_inferior_tty_name (the way it was)"
+
+ mi_gdb_test "307-inferior-tty-show" \
+ "307\\\^done,inferior_tty_terminal=\"$mi_inferior_tty_name\"" \
+ "verify tty is correct"
+}
+
if { [test_mi_interpreter_selection]
&& [test_exec_and_symbol_mi_operatons] } {
test_breakpoints_deletion
test_dir_specification
test_cwd_specification
test_path_specification
+ test_setshow_inferior_tty
}
mi_gdb_exit
--
1.7.7.6
next prev parent reply other threads:[~2012-09-28 0:05 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-31 13:29 [RFC] Merge mi-cli.exp and mi2-cli.exp Yao Qi
2012-09-03 9:08 ` Vladimir Prus
2012-09-03 15:55 ` Yao Qi
2012-09-05 0:29 ` Stan Shebs
2012-09-10 20:09 ` Tom Tromey
2012-09-11 15:15 ` Pedro Alves
2012-09-11 21:53 ` Stan Shebs
2012-09-12 15:28 ` Pedro Alves
2012-09-12 13:59 ` Yao Qi
2012-09-19 11:22 ` Yao Qi
2012-09-19 13:47 ` Pedro Alves
2012-09-21 8:40 ` Yao Qi
2012-09-28 0:04 ` [PATCH 0/11] Cleanup MI test cases Yao Qi
2012-09-28 0:04 ` [PATCH 05/11] mi-pthreads.exp Yao Qi
2012-09-28 0:04 ` [PATCH 02/11] mi-var-block.exp Yao Qi
2012-09-28 0:05 ` [PATCH 06/11] mi-break.exp Yao Qi
2012-09-28 0:05 ` [PATCH 01/11] Remove mi-FOO.exp which are identical to mi2-FOO.exp Yao Qi
2012-09-28 0:05 ` [PATCH 11/11] mi-syn-frame.exp Yao Qi
2012-09-28 0:05 ` [PATCH 08/11] mi-var-display.exp Yao Qi
2012-09-28 0:05 ` [PATCH 09/11] mi-console.exp Yao Qi
2012-09-28 0:05 ` [PATCH 03/11] mi-file.exp Yao Qi
2012-09-28 0:05 ` Yao Qi [this message]
2012-09-28 0:05 ` [PATCH 10/11] mi-stack.exp Yao Qi
2012-09-28 0:05 ` [PATCH 07/11] mi-var-cmd.exp Yao Qi
2012-09-28 19:36 ` [PATCH 0/11] Cleanup MI test cases Pedro Alves
2012-10-12 9:47 ` Yao Qi
2012-10-12 10:05 ` Pedro Alves
2012-10-14 12:25 ` [committed] : " Yao Qi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1348790666-2544-5-git-send-email-yao@codesourcery.com \
--to=yao@codesourcery.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox