From patchwork Tue Apr 21 18:08:09 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Alves X-Patchwork-Id: 6349 Received: (qmail 92023 invoked by alias); 21 Apr 2015 18:08:38 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 91914 invoked by uid 89); 21 Apr 2015 18:08:37 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_00, SPF_HELO_PASS, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Tue, 21 Apr 2015 18:08:36 +0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t3LI8ZXK009155 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Tue, 21 Apr 2015 14:08:35 -0400 Received: from brno.lan (ovpn01.gateway.prod.ext.ams2.redhat.com [10.39.146.11]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t3LI8WKp028722 for ; Tue, 21 Apr 2015 14:08:35 -0400 From: Pedro Alves To: gdb-patches@sourceware.org Subject: [PATCH 02/24] gdb.base/interrupt.exp: Rename saw_eof to saw_end_of_file Date: Tue, 21 Apr 2015 19:08:09 +0100 Message-Id: <1429639711-16459-3-git-send-email-palves@redhat.com> In-Reply-To: <1429639711-16459-1-git-send-email-palves@redhat.com> References: <1429639711-16459-1-git-send-email-palves@redhat.com> To avoid confusion between "end of file" string matching and eof matching, as in process exit. gdb/testsuite/ChangeLog: 2015-04-21 Pedro Alves * gdb.base/interrupt.exp: Rename saw_eof to saw_end_of_file. --- gdb/testsuite/gdb.base/interrupt.exp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gdb/testsuite/gdb.base/interrupt.exp b/gdb/testsuite/gdb.base/interrupt.exp index d093ff5..17a9bad 100644 --- a/gdb/testsuite/gdb.base/interrupt.exp +++ b/gdb/testsuite/gdb.base/interrupt.exp @@ -200,16 +200,16 @@ if ![file exists $binfile] then { } } - set saw_eof 0 + set saw_end_of_file 0 set saw_inferior_exit 0 set msg "send end of file" send_inferior "\004" gdb_test_multiple "" $msg { - -i "$inferior_spawn_id" -re "end of file" { - verbose -log "saw eof: $saw_eof" - set saw_eof 1 - verbose -log "saw eof" + -i $inferior_spawn_id -re "end of file" { + verbose -log "saw \"end of file\": $saw_end_of_file" + set saw_end_of_file 1 + verbose -log "saw \"end of file\"" if {!$saw_inferior_exit} { exp_continue } @@ -217,13 +217,13 @@ if ![file exists $binfile] then { -i "$gdb_spawn_id" -re "$inferior_exited_re normally.*$gdb_prompt " { set saw_inferior_exit 1 verbose -log "saw inferior exit" - if {!$saw_eof} { + if {!$saw_end_of_file} { exp_continue } } } - gdb_assert { $saw_eof && $saw_inferior_exit } $msg + gdb_assert { $saw_end_of_file && $saw_inferior_exit } $msg } } return 0