From: Tom Tromey <tromey@adacore.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tromey@adacore.com>
Subject: [PATCH] Clean up "return -1" in gdb.rust
Date: Fri, 31 Oct 2025 13:30:58 -0600 [thread overview]
Message-ID: <20251031193102.2661619-1-tromey@adacore.com> (raw)
This changes gdb.rust tests to use plain "return" rather than
"return -1". In these spots, the "-1" has no meaning.
---
gdb/testsuite/gdb.rust/completion.exp | 4 ++--
gdb/testsuite/gdb.rust/dwindex.exp | 4 ++--
gdb/testsuite/gdb.rust/finish.exp | 4 ++--
gdb/testsuite/gdb.rust/fnfield.exp | 4 ++--
gdb/testsuite/gdb.rust/generics.exp | 4 ++--
gdb/testsuite/gdb.rust/main-crash.exp | 4 ++--
gdb/testsuite/gdb.rust/methods.exp | 4 ++--
gdb/testsuite/gdb.rust/modules.exp | 4 ++--
gdb/testsuite/gdb.rust/onetwoeight.exp | 6 +++---
gdb/testsuite/gdb.rust/pp.exp | 4 ++--
gdb/testsuite/gdb.rust/rawids.exp | 4 ++--
gdb/testsuite/gdb.rust/rust-start.exp | 4 ++--
gdb/testsuite/gdb.rust/rust-style.exp | 4 ++--
gdb/testsuite/gdb.rust/simple.exp | 4 ++--
gdb/testsuite/gdb.rust/traits.exp | 4 ++--
gdb/testsuite/gdb.rust/unicode.exp | 4 ++--
gdb/testsuite/gdb.rust/union.exp | 4 ++--
gdb/testsuite/gdb.rust/unsized.exp | 4 ++--
gdb/testsuite/gdb.rust/unsized2.exp | 4 ++--
gdb/testsuite/gdb.rust/watch.exp | 4 ++--
20 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/gdb/testsuite/gdb.rust/completion.exp b/gdb/testsuite/gdb.rust/completion.exp
index eac5a434694..0edd8cbd480 100644
--- a/gdb/testsuite/gdb.rust/completion.exp
+++ b/gdb/testsuite/gdb.rust/completion.exp
@@ -22,13 +22,13 @@ require {can_compile rust}
standard_testfile .rs
if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {
- return -1
+ return
}
set line [gdb_get_line_number "set breakpoint here"]
if {![runto ${srcfile}:$line]} {
untested "could not run to breakpoint"
- return -1
+ return
}
with_timeout_factor 2 {
diff --git a/gdb/testsuite/gdb.rust/dwindex.exp b/gdb/testsuite/gdb.rust/dwindex.exp
index a9e10e132ed..ba656fbc4af 100644
--- a/gdb/testsuite/gdb.rust/dwindex.exp
+++ b/gdb/testsuite/gdb.rust/dwindex.exp
@@ -22,12 +22,12 @@ require {can_compile rust}
standard_testfile .rs
if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {
- return -1
+ return
}
if {[ensure_gdb_index $binfile -dwarf-5] == -1} {
untested "error adding gdb index"
- return -1
+ return
}
gdb_exit
diff --git a/gdb/testsuite/gdb.rust/finish.exp b/gdb/testsuite/gdb.rust/finish.exp
index 96545fbcc0a..6b941c81470 100644
--- a/gdb/testsuite/gdb.rust/finish.exp
+++ b/gdb/testsuite/gdb.rust/finish.exp
@@ -21,13 +21,13 @@ require {can_compile rust}
standard_testfile .rs
if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {
- return -1
+ return
}
set line [gdb_get_line_number "BREAK"]
if {![runto ${srcfile}:$line]} {
untested "could not run to breakpoint"
- return -1
+ return
}
# This 'finish' used to crash. See PR rust/30090. Also, this does
diff --git a/gdb/testsuite/gdb.rust/fnfield.exp b/gdb/testsuite/gdb.rust/fnfield.exp
index a45ae94f0db..9df8c85192d 100644
--- a/gdb/testsuite/gdb.rust/fnfield.exp
+++ b/gdb/testsuite/gdb.rust/fnfield.exp
@@ -21,13 +21,13 @@ require {can_compile rust}
standard_testfile .rs
if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {
- return -1
+ return
}
set line [gdb_get_line_number "set breakpoint here"]
if {![runto ${srcfile}:$line]} {
untested "could not run to breakpoint"
- return -1
+ return
}
gdb_test "print foo.f()" " = 6" "call impl function"
diff --git a/gdb/testsuite/gdb.rust/generics.exp b/gdb/testsuite/gdb.rust/generics.exp
index d7a34bf84d2..12155796294 100644
--- a/gdb/testsuite/gdb.rust/generics.exp
+++ b/gdb/testsuite/gdb.rust/generics.exp
@@ -21,13 +21,13 @@ require {can_compile rust}
standard_testfile .rs
if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {
- return -1
+ return
}
set line [gdb_get_line_number "set breakpoint here"]
if {![runto ${srcfile}:$line]} {
untested "could not run to breakpoint"
- return -1
+ return
}
gdb_test "print identity::<u32>(23u32)" " = 23"
diff --git a/gdb/testsuite/gdb.rust/main-crash.exp b/gdb/testsuite/gdb.rust/main-crash.exp
index 1d246ee8ffb..5a42966fb1a 100644
--- a/gdb/testsuite/gdb.rust/main-crash.exp
+++ b/gdb/testsuite/gdb.rust/main-crash.exp
@@ -22,14 +22,14 @@ require {can_compile rust}
standard_testfile main.rs
if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
{debug rust}]} {
- return -1
+ return
}
set line [gdb_get_line_number "BREAK"]
# The bug was that this would crash.
if {![runto ${srcfile}:$line]} {
untested "could not run to breakpoint"
- return -1
+ return
}
# Test that gdb is alive.
diff --git a/gdb/testsuite/gdb.rust/methods.exp b/gdb/testsuite/gdb.rust/methods.exp
index 0061b46c9e3..9526ca49319 100644
--- a/gdb/testsuite/gdb.rust/methods.exp
+++ b/gdb/testsuite/gdb.rust/methods.exp
@@ -21,13 +21,13 @@ require {can_compile rust}
standard_testfile .rs
if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {
- return -1
+ return
}
set line [gdb_get_line_number "set breakpoint 1 here"]
if {![runto ${srcfile}:$line]} {
untested "could not run to breakpoint"
- return -1
+ return
}
gdb_test "print x" " = methods::HasMethods \\{value: 0\\}"
diff --git a/gdb/testsuite/gdb.rust/modules.exp b/gdb/testsuite/gdb.rust/modules.exp
index 0874db3056d..426eb4652b7 100644
--- a/gdb/testsuite/gdb.rust/modules.exp
+++ b/gdb/testsuite/gdb.rust/modules.exp
@@ -21,13 +21,13 @@ require {can_compile rust}
standard_testfile .rs
if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {
- return -1
+ return
}
set line [gdb_get_line_number "set breakpoint here"]
if {![runto ${srcfile}:$line]} {
untested "could not run to breakpoint"
- return -1
+ return
}
# Currently a closure type is not described by rustc.
diff --git a/gdb/testsuite/gdb.rust/onetwoeight.exp b/gdb/testsuite/gdb.rust/onetwoeight.exp
index 8ae9d54ec54..e1353c05568 100644
--- a/gdb/testsuite/gdb.rust/onetwoeight.exp
+++ b/gdb/testsuite/gdb.rust/onetwoeight.exp
@@ -22,18 +22,18 @@ require {can_compile rust}
set v [split [rust_compiler_version] .]
if {[lindex $v 0] == 1 && [lindex $v 1] < 43} {
untested "128-bit ints require rust 1.43 or greater"
- return -1
+ return
}
standard_testfile .rs
if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {
- return -1
+ return
}
set line [gdb_get_line_number "BREAK"]
if {![runto ${srcfile}:$line]} {
untested "could not run to breakpoint"
- return -1
+ return
}
gdb_test "print x" " = 340282366920938463463374607431768211455"
diff --git a/gdb/testsuite/gdb.rust/pp.exp b/gdb/testsuite/gdb.rust/pp.exp
index aa989c0552e..e287c3e51f6 100644
--- a/gdb/testsuite/gdb.rust/pp.exp
+++ b/gdb/testsuite/gdb.rust/pp.exp
@@ -22,7 +22,7 @@ require {can_compile rust}
standard_testfile .rs
if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {
- return -1
+ return
}
set remote_python_file [gdb_remote_download host \
@@ -32,7 +32,7 @@ gdb_test_no_output "source ${remote_python_file}" "load python file"
set line [gdb_get_line_number "set breakpoint here"]
if {![runto ${srcfile}:$line]} {
untested "could not run to breakpoint"
- return -1
+ return
}
gdb_test "print outer" " = pp::Outer \\(x\\(5\\)\\)"
diff --git a/gdb/testsuite/gdb.rust/rawids.exp b/gdb/testsuite/gdb.rust/rawids.exp
index 9029e2fd5c6..d98b748f8d6 100644
--- a/gdb/testsuite/gdb.rust/rawids.exp
+++ b/gdb/testsuite/gdb.rust/rawids.exp
@@ -22,13 +22,13 @@ require {rust_at_least 1.30}
standard_testfile .rs
if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {
- return -1
+ return
}
set line [gdb_get_line_number "set breakpoint here"]
if {![runto ${srcfile}:$line]} {
untested "could not run to breakpoint"
- return -1
+ return
}
gdb_test "print r#if" " = 23"
diff --git a/gdb/testsuite/gdb.rust/rust-start.exp b/gdb/testsuite/gdb.rust/rust-start.exp
index 1287d83e840..e2429cd04d2 100644
--- a/gdb/testsuite/gdb.rust/rust-start.exp
+++ b/gdb/testsuite/gdb.rust/rust-start.exp
@@ -25,13 +25,13 @@ require !use_gdb_stub
standard_testfile simple.rs
if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {
- return -1
+ return
}
# Verify that "start" lands inside the right procedure.
if {[gdb_start_cmd] < 0} {
unsupported "start failed"
- return -1
+ return
}
gdb_test "" \
diff --git a/gdb/testsuite/gdb.rust/rust-style.exp b/gdb/testsuite/gdb.rust/rust-style.exp
index ae01ad6d9ee..bbee56447f1 100644
--- a/gdb/testsuite/gdb.rust/rust-style.exp
+++ b/gdb/testsuite/gdb.rust/rust-style.exp
@@ -23,13 +23,13 @@ with_ansi_styling_terminal {
standard_testfile .rs
if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
{debug rust}]} {
- return -1
+ return
}
set line [gdb_get_line_number "breakpoint"]
if {![runto ${srcfile}:$line]} {
untested "could not run to breakpoint"
- return -1
+ return
}
set vfield [style value variable]
diff --git a/gdb/testsuite/gdb.rust/simple.exp b/gdb/testsuite/gdb.rust/simple.exp
index a236a30d002..2377e09b893 100644
--- a/gdb/testsuite/gdb.rust/simple.exp
+++ b/gdb/testsuite/gdb.rust/simple.exp
@@ -21,13 +21,13 @@ require {can_compile rust}
standard_testfile .rs
if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {
- return -1
+ return
}
set line [gdb_get_line_number "set breakpoint here"]
if {![runto ${srcfile}:$line]} {
untested "could not run to breakpoint"
- return -1
+ return
}
gdb_test "print a" " = \\(\\)"
diff --git a/gdb/testsuite/gdb.rust/traits.exp b/gdb/testsuite/gdb.rust/traits.exp
index 82fc894febe..50800702d7e 100644
--- a/gdb/testsuite/gdb.rust/traits.exp
+++ b/gdb/testsuite/gdb.rust/traits.exp
@@ -21,7 +21,7 @@ require {can_compile rust}
standard_testfile .rs
if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {
- return -1
+ return
}
set readelf_program [gdb_find_readelf]
@@ -39,7 +39,7 @@ if {![regexp DW_AT_containing_type $output]} {
set line [gdb_get_line_number "set breakpoint here"]
if {![runto ${srcfile}:$line]} {
untested "could not run to breakpoint"
- return -1
+ return
}
gdb_test "print *td" " = 23.5"
diff --git a/gdb/testsuite/gdb.rust/unicode.exp b/gdb/testsuite/gdb.rust/unicode.exp
index a86e59f69da..ef6818d8f93 100644
--- a/gdb/testsuite/gdb.rust/unicode.exp
+++ b/gdb/testsuite/gdb.rust/unicode.exp
@@ -28,13 +28,13 @@ setenv LC_ALL C.UTF-8
standard_testfile .rs
if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {
- return -1
+ return
}
set line [gdb_get_line_number "set breakpoint here"]
if {![runto ${srcfile}:$line]} {
untested "could not run to breakpoint"
- return -1
+ return
}
gdb_test "print 𝕯" " = 98" "print D"
diff --git a/gdb/testsuite/gdb.rust/union.exp b/gdb/testsuite/gdb.rust/union.exp
index 55fe6dbd01f..87c28ebeb34 100644
--- a/gdb/testsuite/gdb.rust/union.exp
+++ b/gdb/testsuite/gdb.rust/union.exp
@@ -21,13 +21,13 @@ require {can_compile rust}
standard_testfile .rs
if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {
- return -1
+ return
}
set line [gdb_get_line_number "set breakpoint here"]
if {![runto ${srcfile}:$line]} {
untested "could not run to breakpoint"
- return -1
+ return
}
gdb_test "print u" " = union::Union {f1: -1, f2: 255}"
diff --git a/gdb/testsuite/gdb.rust/unsized.exp b/gdb/testsuite/gdb.rust/unsized.exp
index f91614551d7..95abab50c1b 100644
--- a/gdb/testsuite/gdb.rust/unsized.exp
+++ b/gdb/testsuite/gdb.rust/unsized.exp
@@ -21,13 +21,13 @@ require {can_compile rust}
standard_testfile .rs
if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {
- return -1
+ return
}
set line [gdb_get_line_number "set breakpoint here"]
if {![runto ${srcfile}:$line]} {
untested "could not run to breakpoint"
- return -1
+ return
}
gdb_test "ptype us" " = .*V<\\\[u8\\\]>.*"
diff --git a/gdb/testsuite/gdb.rust/unsized2.exp b/gdb/testsuite/gdb.rust/unsized2.exp
index d4d5ea1915c..85c091c6252 100644
--- a/gdb/testsuite/gdb.rust/unsized2.exp
+++ b/gdb/testsuite/gdb.rust/unsized2.exp
@@ -22,13 +22,13 @@ require {rust_at_least 1.61}
standard_testfile .rs
if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {
- return -1
+ return
}
set line [gdb_get_line_number "set breakpoint here"]
if {![runto ${srcfile}:$line]} {
untested "could not run to breakpoint"
- return -1
+ return
}
set base_value \
diff --git a/gdb/testsuite/gdb.rust/watch.exp b/gdb/testsuite/gdb.rust/watch.exp
index a90abd761a1..33d7279db56 100644
--- a/gdb/testsuite/gdb.rust/watch.exp
+++ b/gdb/testsuite/gdb.rust/watch.exp
@@ -21,13 +21,13 @@ require {can_compile rust}
standard_testfile .rs
if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {
- return -1
+ return
}
set line [gdb_get_line_number "set breakpoint here"]
if {![runto ${srcfile}:$line]} {
untested "could not run to breakpoint"
- return -1
+ return
}
# Just setting a watchpoint was enough to trigger the bug.
base-commit: 2f53fb60c9c63c47ed65adeda70194f7984dfbba
--
2.51.0
next reply other threads:[~2025-10-31 19:31 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-31 19:30 Tom Tromey [this message]
2025-11-01 3:53 ` Kevin Buettner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20251031193102.2661619-1-tromey@adacore.com \
--to=tromey@adacore.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox