From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 16019 invoked by alias); 28 Sep 2012 00:05:11 -0000 Received: (qmail 15888 invoked by uid 22791); 28 Sep 2012 00:05:06 -0000 X-SWARE-Spam-Status: No, hits=-4.5 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,KHOP_THREADED,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL X-Spam-Check-By: sourceware.org Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 28 Sep 2012 00:04:59 +0000 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1THO4g-0003wJ-Ki from Yao_Qi@mentor.com for gdb-patches@sourceware.org; Thu, 27 Sep 2012 17:04:58 -0700 Received: from SVR-ORW-FEM-03.mgc.mentorg.com ([147.34.97.39]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Thu, 27 Sep 2012 17:04:58 -0700 Received: from qiyao.dyndns.org.dyndns.org (147.34.91.1) by svr-orw-fem-03.mgc.mentorg.com (147.34.97.39) with Microsoft SMTP Server id 14.1.289.1; Thu, 27 Sep 2012 17:04:57 -0700 From: Yao Qi To: Subject: [PATCH 09/11] mi-console.exp Date: Fri, 28 Sep 2012 00:05:00 -0000 Message-ID: <1348790666-2544-10-git-send-email-yao@codesourcery.com> In-Reply-To: <1348790666-2544-1-git-send-email-yao@codesourcery.com> References: <1346419770-5718-1-git-send-email-yao@codesourcery.com> <1348790666-2544-1-git-send-email-yao@codesourcery.com> MIME-Version: 1.0 Content-Type: text/plain X-IsSubscribed: yes Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2012-09/txt/msg00654.txt.bz2 gdb/testsuite: 2012-09-27 Yao Qi * gdb.mi/mi-console.exp: * gdb.mi/mi2-console.exp: Merged from mi-console.exp. --- gdb/testsuite/gdb.mi/mi-console.exp | 58 ---------------------------------- gdb/testsuite/gdb.mi/mi2-console.exp | 30 +++-------------- 2 files changed, 5 insertions(+), 83 deletions(-) delete mode 100644 gdb/testsuite/gdb.mi/mi-console.exp diff --git a/gdb/testsuite/gdb.mi/mi-console.exp b/gdb/testsuite/gdb.mi/mi-console.exp deleted file mode 100644 index 891c743..0000000 --- a/gdb/testsuite/gdb.mi/mi-console.exp +++ /dev/null @@ -1,58 +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 . - -# -# Test essential Machine interface (MI) operations -# -# Verify that, using the MI, we can run a simple program and perform basic -# debugging activities like: insert breakpoints, run the program, -# step, next, continue until it ends and, last but not least, quit. -# -# The goal is not to test gdb functionality, which is done by other tests, -# but to verify the correct output response to MI operations. -# - -# This test only works when talking to a target that routes its output -# through GDB. Check that we're either talking to a simulator or a -# remote target. - -load_lib mi-support.exp -set MIFLAGS "-i=mi" - -gdb_exit -if [mi_gdb_start separate-inferior-tty] { - continue -} - -standard_testfile - -if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested mi-console.exp - return -1 -} - -mi_run_to_main - -# Next over the hello() call which will produce lots of output -mi_gdb_test "220-exec-next" \ - "220\\^running(\r\n\\*running,thread-id=\"all\")?" \ - "Testing console output" \ - "Hello \\\\\"!\[\r\n\]+" - -mi_expect_stop "end-stepping-range" "main" "" ".*mi-console.c" "14" "" \ - "finished step over hello" - -mi_gdb_exit -return 0 diff --git a/gdb/testsuite/gdb.mi/mi2-console.exp b/gdb/testsuite/gdb.mi/mi2-console.exp index e1e180b..472bea6 100644 --- a/gdb/testsuite/gdb.mi/mi2-console.exp +++ b/gdb/testsuite/gdb.mi/mi2-console.exp @@ -32,7 +32,7 @@ load_lib mi-support.exp set MIFLAGS "-i=mi2" gdb_exit -if [mi_gdb_start] { +if [mi_gdb_start separate-inferior-tty] { continue } @@ -46,30 +46,10 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb mi_run_to_main # Next over the hello() call which will produce lots of output -mi_gdb_test "220-exec-next" "220\\^running(\r\n)?(\\*running,thread-id=\"all\")?" \ - "Started step over hello" - -if { ![target_info exists gdb,noinferiorio] } { - gdb_expect { - -re "@\"H\"\r\n.*@\"e\"\r\n.*@\"l\"\r\n.*@\"l\"\r\n.*@\"o\"\r\n.*@\" \"\r\n.*@\"\\\\\\\\\"\r\n.*@\"\\\\\"\"\r\n.*@\"!\"\r\n.*@\"\\\\r\"\r\n.*@\"\\\\n\"\r\n" { - pass "Hello message" - } - -re "Hello" { - - # Probably a native system where GDB doesn't have direct # - # control over the inferior console. # For this to work, - # GDB would need to run the inferior process # under a PTY - # and then use the even-loops ability to wait on # - # multiple event sources to channel the output back - # through the # MI. - - kfail "gdb/623" "Hello message" - } - timeout { - fail "Hello message (timeout)" - } - } -} +mi_gdb_test "220-exec-next" \ + "220\\^running(\r\n\\*running,thread-id=\"all\")?" \ + "Testing console output" \ + "Hello \\\\\"!\[\r\n\]+" mi_expect_stop "end-stepping-range" "main" "" ".*mi-console.c" "14" "" \ "finished step over hello" -- 1.7.7.6