From patchwork Mon Feb 9 23:20:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Alves X-Patchwork-Id: 4999 Received: (qmail 13131 invoked by alias); 9 Feb 2015 23:21:49 -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 13119 invoked by uid 89); 9 Feb 2015 23:21:49 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 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; Mon, 09 Feb 2015 23:21:48 +0000 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t19NLlC8011779 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Mon, 9 Feb 2015 18:21:47 -0500 Received: from brno.lan (ovpn01.gateway.prod.ext.ams2.redhat.com [10.39.146.11]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t19NKkup026307 for ; Mon, 9 Feb 2015 18:21:46 -0500 From: Pedro Alves To: gdb-patches@sourceware.org Subject: [PATCH 26/36] Adjust self tests to cope with GDB built as a C++ program Date: Mon, 9 Feb 2015 23:20:36 +0000 Message-Id: <1423524046-20605-27-git-send-email-palves@redhat.com> In-Reply-To: <1423524046-20605-1-git-send-email-palves@redhat.com> References: <1423524046-20605-1-git-send-email-palves@redhat.com> gdb/testsuite/ 2015-02-09 Pedro Alves * gdb.gdb/complaints.exp (test_initial_complaints): Also accept "true" for boolean result. * gdb.gdb/selftest.exp (test_with_self): Also accept full prototype of main. --- gdb/testsuite/gdb.gdb/complaints.exp | 6 ++++-- gdb/testsuite/gdb.gdb/selftest.exp | 6 +++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gdb/testsuite/gdb.gdb/complaints.exp b/gdb/testsuite/gdb.gdb/complaints.exp index 500f414..707b2a5 100644 --- a/gdb/testsuite/gdb.gdb/complaints.exp +++ b/gdb/testsuite/gdb.gdb/complaints.exp @@ -43,9 +43,11 @@ proc test_initial_complaints { } { gdb_test "call complaint (&symfile_complaints, symfile_complaints->root->fmt)" \ "During symbol reading, Register a complaint." - # Check that there is only one thing in the list + # Check that there is only one thing in the list. How the boolean + # result is output depends on whether GDB is built as a C or C++ + # program. gdb_test "print symfile_complaints->root->next == &complaint_sentinel" \ - ".\[0-9\]+ = 1" "list has one entry" + ".\[0-9\]+ = \(1|true\)" "list has one entry" # Add a second complaint, expect it gdb_test "call complaint (&symfile_complaints, \"Testing! Testing! Testing!\")" \ diff --git a/gdb/testsuite/gdb.gdb/selftest.exp b/gdb/testsuite/gdb.gdb/selftest.exp index b32e799..9f25a48 100644 --- a/gdb/testsuite/gdb.gdb/selftest.exp +++ b/gdb/testsuite/gdb.gdb/selftest.exp @@ -288,9 +288,13 @@ proc test_with_self { executable } { return -1 } + # When GDB is built as a C++ program, disassemble shows the full + # prototype. + set cxx_main_args_re [string_to_regexp "(int, char**)"] + # disassemble yourself gdb_test "x/10i main" \ - "x/10i.*main.*main.$decimal.*main.$decimal.*" \ + "x/10i.*main.*main($cxx_main_args_re)?.$decimal.*main($cxx_main_args_re)?.$decimal.*" \ "Disassemble main" # Set a breakpoint at main