From e0bd9202fb13262101550d788db536ad5ca55c26 Mon Sep 17 00:00:00 2001
From: Simon Marchi <simon.marchi@polymtl.ca>
Date: Tue, 2 Feb 2021 11:52:14 -0500
Subject: [PATCH] gdb/testsuite: use proc_with_prefix in gdb.base/scope.exp

Fixes:

    Running /home/simark/src/binutils-gdb/gdb/testsuite/gdb.base/scope.exp ...
    DUPLICATE: gdb.base/scope.exp: print 'scope0.c'::filelocal_ro
    DUPLICATE: gdb.base/scope.exp: print 'scope0.c'::filelocal_ro
    DUPLICATE: gdb.base/scope.exp: next

gdb/testsuite/ChangeLog:

	* gdb.base/scope.exp: Use proc_with_prefix.

Change-Id: Ic40e24a603da6f2a4f8003b74b2ff3040d2b098d
---
 gdb/testsuite/ChangeLog          |  4 ++++
 gdb/testsuite/gdb.base/scope.exp | 10 +++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index f980bac89aa..f03b2db727b 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2021-02-02  Simon Marchi  <simon.marchi@polymtl.ca>
+
+	* gdb.base/scope.exp: Use proc_with_prefix.
+
 2021-02-02  Simon Marchi  <simon.marchi@efficios.com>
 
 	* lib/dwarf.exp (rnglists): Add -no-offset-array option to
diff --git a/gdb/testsuite/gdb.base/scope.exp b/gdb/testsuite/gdb.base/scope.exp
index edf9811ad3b..51a5ec4d949 100644
--- a/gdb/testsuite/gdb.base/scope.exp
+++ b/gdb/testsuite/gdb.base/scope.exp
@@ -33,7 +33,7 @@ if [get_compiler_info] {
 # running init0().  To prevent cascading of errors, we report the
 # first one and quit.  If all pass, then we print the pass results.
 
-proc test_at_main {} {
+proc_with_prefix test_at_main {} {
     global gdb_prompt
     global decimal
     global det_file
@@ -95,7 +95,7 @@ proc test_at_main {} {
     gdb_test "print 'scope1.c'::bar::funclocal" "\\\$$decimal = 4" "print 'scope1.c'::bar::funclocal"  "No symbol \"scope1.c\" in current context.*" "print '$srcdir/$subdir/scope1.c'::bar::funclocal"
 }
 
-proc test_at_foo {} {
+proc_with_prefix test_at_foo {} {
     global gdb_prompt
     global decimal
     global det_file
@@ -180,7 +180,7 @@ proc test_at_foo {} {
 
 }
 
-proc test_at_bar {} {
+proc_with_prefix test_at_bar {} {
     global gdb_prompt
     global decimal
     global det_file
@@ -253,7 +253,7 @@ proc test_at_bar {} {
 # This test has little to do with local scopes, but it is in scope.exp anyway.
 # That's life.
 
-proc test_at_autovars {} {
+proc_with_prefix test_at_autovars {} {
     global gdb_prompt
     global decimal
     global hex
@@ -278,7 +278,7 @@ proc test_at_autovars {} {
     gdb_test "frame" "#.*autovars \\(bcd=5, abc=6\\).*" "args in correct order"
 }
 
-proc test_at_localscopes {} {
+proc_with_prefix test_at_localscopes {} {
     global gdb_prompt
     global decimal
     global hex
-- 
2.30.2