Update copyright year range in all GDB files.

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.cp / extern-c.exp

diff --git a/gdb/testsuite/gdb.cp/extern-c.exp b/gdb/testsuite/gdb.cp/extern-c.exp
index 5ad4e9c00b678bb9927aaba6d33524d89d3fa59a..522c241111e9f729561020072c0361eacb98fcba 100644 (file)
--- a/gdb/testsuite/gdb.cp/extern-c.exp
+++ b/gdb/testsuite/gdb.cp/extern-c.exp
@@ -1,4 +1,4 @@
-# Copyright 2009, 2010 Free Software Foundation, Inc.
+# Copyright 2009-2020 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
@@ -17,22 +17,12 @@
 
 if { [skip_cplus_tests] } { continue }
 
-set testfile "extern-c"
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile .cc
 
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-     untested extern-c.exp
-     return -1
+if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug c++}]} {
+    return -1
 }
 
-# Start with a fresh gdb
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
 runto_main
 
 if { [gdb_breakpoint "c_func"] == 1 } {
@@ -40,7 +30,7 @@ if { [gdb_breakpoint "c_func"] == 1 } {
 }
 gdb_continue_to_breakpoint "c_func" ".*c_func.*"
 
-gdb_test "set \$counter = 0" "" "initialize counter"
+gdb_test_no_output "set \$counter = 0" "initialize counter"
 
 gdb_test "rbreak c_funcs" \
     "Breakpoint.* at .*c_funcs_1.*Breakpoint.* at .*c_funcs_2.*"
@@ -48,7 +38,7 @@ gdb_test "rbreak c_funcs" \
 # Test that "commands" without an argument puts commands on both
 # breakpoints.
 gdb_test_multiple "commands" "set commands on multiple breakpoints" {
-  -re "Type commands for all specified breakpoints\r\nEnd with a line saying just \"end\".\r\n>$" {
+  -re "Type commands for breakpoint\\(s\\) 3-4, one per line\.\r\nEnd with a line saying just \"end\".\r\n>$" {
     gdb_test_multiple "set \$counter = \$counter + 1\nend" \
       "command details for multiple breakpoints" {
        -re "$gdb_prompt $" {