gdb/testsuite: add return after a call to 'untested'

In gdb.base/corefile-buildid.exp, in the function
do_corefile_buildid_tests, if we fail to find the build-id for the
test binary then we call 'untested', but then push on with the test,
which inevitably fails as the rest of the test depends on having found
the build-id.

I think we're missing a 'return' after the call to 'untested' which
I've now added.

Also I noticed that we call build_id_debug_filename_get and then
manually remove '.debug' from the end.  This is no longer necessary,
we can just ask build_id_debug_filename_get to not add the suffix.

diff --git a/gdb/testsuite/gdb.base/corefile-buildid.exp b/gdb/testsuite/gdb.base/corefile-buildid.exp
index e1b9804d89185c302a5fc07d82d80107f65f8f94..fc54cf201d9c7f970ce5f82c990206d9a44e8bbe 100644 (file)
--- a/gdb/testsuite/gdb.base/corefile-buildid.exp
+++ b/gdb/testsuite/gdb.base/corefile-buildid.exp
@@ -268,12 +268,13 @@ proc do_corefile_buildid_tests {args} {
            return
        }
 
-       # Grab the build-id from the binary, removing ".debug" from the end.
-       set buildid [build_id_debug_filename_get $program_to_run]
+       # Get the build-id filename without ".debug" on the end.  This
+       # will have the format: '.build-id/xx/xxxxx'
+       set buildid [build_id_debug_filename_get $program_to_run ""]
        if {$buildid == ""} {
            untested "binary has no build-id"
+           return
        }
-       regsub {\.debug$} $buildid {} buildid
        verbose -log "build-id is $buildid"
 
        locate_exec_from_core_build_id $corefile $buildid \