From a37bfa30016370992c59105fb4fd97cd3a264149 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Wed, 22 Oct 2014 15:14:41 +0100 Subject: [PATCH] Adjust self tests to cope with GDB built as a C++ program gdb/testsuite/ 2015-02-27 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/ChangeLog | 7 +++++++ gdb/testsuite/gdb.gdb/complaints.exp | 6 ++++-- gdb/testsuite/gdb.gdb/selftest.exp | 6 +++++- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index efc74f6d327..60dbaa88a14 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2015-02-27 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. + 2015-02-27 Pedro Alves * lib/unbuffer_output.c: New file. diff --git a/gdb/testsuite/gdb.gdb/complaints.exp b/gdb/testsuite/gdb.gdb/complaints.exp index 500f4143b4f..707b2a57d4a 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 b32e7995ac6..9f25a48bae2 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 -- 2.30.2