From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [RFC 4/5] Use "critical prepare_for_testing" in gdb.rust
Date: Sat, 15 Apr 2023 09:13:35 -0600 [thread overview]
Message-ID: <20230415151336.4104455-5-tom@tromey.com> (raw)
In-Reply-To: <20230415151336.4104455-1-tom@tromey.com>
This converts gdb.rust to use "critical prepare_for_testing" rather
than "if".
---
gdb/testsuite/gdb.rust/completion.exp | 5 ++---
gdb/testsuite/gdb.rust/dwindex.exp | 5 ++---
gdb/testsuite/gdb.rust/finish.exp | 5 ++---
gdb/testsuite/gdb.rust/fnfield.exp | 5 ++---
gdb/testsuite/gdb.rust/generics.exp | 5 ++---
gdb/testsuite/gdb.rust/main-crash.exp | 6 ++----
gdb/testsuite/gdb.rust/methods.exp | 5 ++---
gdb/testsuite/gdb.rust/modules.exp | 5 ++---
gdb/testsuite/gdb.rust/onetwoeight.exp | 5 ++---
gdb/testsuite/gdb.rust/pp.exp | 5 ++---
gdb/testsuite/gdb.rust/rawids.exp | 5 ++---
gdb/testsuite/gdb.rust/rust-start.exp | 5 ++---
gdb/testsuite/gdb.rust/rust-style.exp | 6 ++----
gdb/testsuite/gdb.rust/simple.exp | 5 ++---
gdb/testsuite/gdb.rust/traits.exp | 5 ++---
gdb/testsuite/gdb.rust/unicode.exp | 5 ++---
gdb/testsuite/gdb.rust/union.exp | 5 ++---
gdb/testsuite/gdb.rust/unsized.exp | 5 ++---
gdb/testsuite/gdb.rust/watch.exp | 5 ++---
19 files changed, 38 insertions(+), 59 deletions(-)
diff --git a/gdb/testsuite/gdb.rust/completion.exp b/gdb/testsuite/gdb.rust/completion.exp
index 76c45fda7ba..91f8b230f4a 100644
--- a/gdb/testsuite/gdb.rust/completion.exp
+++ b/gdb/testsuite/gdb.rust/completion.exp
@@ -21,9 +21,8 @@ require allow_rust_tests
require {can_compile rust}
standard_testfile .rs
-if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {
- return -1
-}
+critical prepare_for_testing "failed to prepare" $testfile $srcfile \
+ {debug rust}
set line [gdb_get_line_number "set breakpoint here"]
if {![runto ${srcfile}:$line]} {
diff --git a/gdb/testsuite/gdb.rust/dwindex.exp b/gdb/testsuite/gdb.rust/dwindex.exp
index 0b7e3911ab1..e3fe49fbce1 100644
--- a/gdb/testsuite/gdb.rust/dwindex.exp
+++ b/gdb/testsuite/gdb.rust/dwindex.exp
@@ -21,9 +21,8 @@ require {can_compile rust}
standard_testfile .rs
-if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {
- return -1
-}
+critical prepare_for_testing "failed to prepare" $testfile $srcfile \
+ {debug rust}
critical ensure_gdb_index $binfile -dwarf-5
diff --git a/gdb/testsuite/gdb.rust/finish.exp b/gdb/testsuite/gdb.rust/finish.exp
index 373f8d72f5d..630b093b440 100644
--- a/gdb/testsuite/gdb.rust/finish.exp
+++ b/gdb/testsuite/gdb.rust/finish.exp
@@ -20,9 +20,8 @@ require allow_rust_tests
require {can_compile rust}
standard_testfile .rs
-if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {
- return -1
-}
+critical prepare_for_testing "failed to prepare" $testfile $srcfile \
+ {debug rust}
set line [gdb_get_line_number "BREAK"]
if {![runto ${srcfile}:$line]} {
diff --git a/gdb/testsuite/gdb.rust/fnfield.exp b/gdb/testsuite/gdb.rust/fnfield.exp
index 48c6179d7d6..93b00f11b8a 100644
--- a/gdb/testsuite/gdb.rust/fnfield.exp
+++ b/gdb/testsuite/gdb.rust/fnfield.exp
@@ -20,9 +20,8 @@ require allow_rust_tests
require {can_compile rust}
standard_testfile .rs
-if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {
- return -1
-}
+critical prepare_for_testing "failed to prepare" $testfile $srcfile \
+ {debug rust}
set line [gdb_get_line_number "set breakpoint here"]
if {![runto ${srcfile}:$line]} {
diff --git a/gdb/testsuite/gdb.rust/generics.exp b/gdb/testsuite/gdb.rust/generics.exp
index 7afed993a2d..9eba8f5786e 100644
--- a/gdb/testsuite/gdb.rust/generics.exp
+++ b/gdb/testsuite/gdb.rust/generics.exp
@@ -20,9 +20,8 @@ require allow_rust_tests
require {can_compile rust}
standard_testfile .rs
-if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {
- return -1
-}
+critical prepare_for_testing "failed to prepare" $testfile $srcfile \
+ {debug rust}
set line [gdb_get_line_number "set breakpoint here"]
if {![runto ${srcfile}:$line]} {
diff --git a/gdb/testsuite/gdb.rust/main-crash.exp b/gdb/testsuite/gdb.rust/main-crash.exp
index caede88a1fa..450af9ed18c 100644
--- a/gdb/testsuite/gdb.rust/main-crash.exp
+++ b/gdb/testsuite/gdb.rust/main-crash.exp
@@ -20,10 +20,8 @@ require allow_rust_tests
require {can_compile rust}
standard_testfile main.rs
-if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
- {debug rust}]} {
- return -1
-}
+critical prepare_for_testing "failed to prepare" $testfile $srcfile \
+ {debug rust}
set line [gdb_get_line_number "BREAK"]
# The bug was that this would crash.
diff --git a/gdb/testsuite/gdb.rust/methods.exp b/gdb/testsuite/gdb.rust/methods.exp
index dd95429de7d..67792986fad 100644
--- a/gdb/testsuite/gdb.rust/methods.exp
+++ b/gdb/testsuite/gdb.rust/methods.exp
@@ -20,9 +20,8 @@ require allow_rust_tests
require {can_compile rust}
standard_testfile .rs
-if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {
- return -1
-}
+critical prepare_for_testing "failed to prepare" $testfile $srcfile \
+ {debug rust}
set line [gdb_get_line_number "set breakpoint 1 here"]
if {![runto ${srcfile}:$line]} {
diff --git a/gdb/testsuite/gdb.rust/modules.exp b/gdb/testsuite/gdb.rust/modules.exp
index 076ef5c2dd4..ddb9a05c58f 100644
--- a/gdb/testsuite/gdb.rust/modules.exp
+++ b/gdb/testsuite/gdb.rust/modules.exp
@@ -20,9 +20,8 @@ require allow_rust_tests
require {can_compile rust}
standard_testfile .rs
-if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {
- return -1
-}
+critical prepare_for_testing "failed to prepare" $testfile $srcfile \
+ {debug rust}
set line [gdb_get_line_number "set breakpoint here"]
if {![runto ${srcfile}:$line]} {
diff --git a/gdb/testsuite/gdb.rust/onetwoeight.exp b/gdb/testsuite/gdb.rust/onetwoeight.exp
index ef56bcafda2..ad536d27900 100644
--- a/gdb/testsuite/gdb.rust/onetwoeight.exp
+++ b/gdb/testsuite/gdb.rust/onetwoeight.exp
@@ -26,9 +26,8 @@ if {[lindex $v 0] == 1 && [lindex $v 1] < 43} {
}
standard_testfile .rs
-if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {
- return -1
-}
+critical prepare_for_testing "failed to prepare" $testfile $srcfile \
+ {debug rust}
set line [gdb_get_line_number "BREAK"]
if {![runto ${srcfile}:$line]} {
diff --git a/gdb/testsuite/gdb.rust/pp.exp b/gdb/testsuite/gdb.rust/pp.exp
index ef66717607b..0f8fee20fb9 100644
--- a/gdb/testsuite/gdb.rust/pp.exp
+++ b/gdb/testsuite/gdb.rust/pp.exp
@@ -21,9 +21,8 @@ require allow_rust_tests allow_python_tests
require {can_compile rust}
standard_testfile .rs
-if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {
- return -1
-}
+critical prepare_for_testing "failed to prepare" $testfile $srcfile \
+ {debug rust}
set remote_python_file [gdb_remote_download host \
${srcdir}/${subdir}/${testfile}.py]
diff --git a/gdb/testsuite/gdb.rust/rawids.exp b/gdb/testsuite/gdb.rust/rawids.exp
index 55e1b7ffbdd..0c9ecaabe32 100644
--- a/gdb/testsuite/gdb.rust/rawids.exp
+++ b/gdb/testsuite/gdb.rust/rawids.exp
@@ -21,9 +21,8 @@ require {can_compile rust}
require {rust_at_least 1.30}
standard_testfile .rs
-if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {
- return -1
-}
+critical prepare_for_testing "failed to prepare" $testfile $srcfile \
+ {debug rust}
set line [gdb_get_line_number "set breakpoint here"]
if {![runto ${srcfile}:$line]} {
diff --git a/gdb/testsuite/gdb.rust/rust-start.exp b/gdb/testsuite/gdb.rust/rust-start.exp
index ca2608465dd..5ce7b9bb053 100644
--- a/gdb/testsuite/gdb.rust/rust-start.exp
+++ b/gdb/testsuite/gdb.rust/rust-start.exp
@@ -24,9 +24,8 @@ require {can_compile rust}
require !use_gdb_stub
standard_testfile simple.rs
-if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {
- return -1
-}
+critical prepare_for_testing "failed to prepare" $testfile $srcfile \
+ {debug rust}
# Verify that "start" lands inside the right procedure.
if {[gdb_start_cmd] < 0} {
diff --git a/gdb/testsuite/gdb.rust/rust-style.exp b/gdb/testsuite/gdb.rust/rust-style.exp
index 0555ea4b8a4..71a484ae933 100644
--- a/gdb/testsuite/gdb.rust/rust-style.exp
+++ b/gdb/testsuite/gdb.rust/rust-style.exp
@@ -24,10 +24,8 @@ save_vars { env(TERM) } {
setenv TERM ansi
standard_testfile .rs
- if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
- {debug rust}]} {
- return -1
- }
+ critical prepare_for_testing "failed to prepare" $testfile $srcfile \
+ {debug rust}
set line [gdb_get_line_number "breakpoint"]
if {![runto ${srcfile}:$line]} {
diff --git a/gdb/testsuite/gdb.rust/simple.exp b/gdb/testsuite/gdb.rust/simple.exp
index 08ebed3f103..dd73f50af81 100644
--- a/gdb/testsuite/gdb.rust/simple.exp
+++ b/gdb/testsuite/gdb.rust/simple.exp
@@ -20,9 +20,8 @@ require allow_rust_tests
require {can_compile rust}
standard_testfile .rs
-if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {
- return -1
-}
+critical prepare_for_testing "failed to prepare" $testfile $srcfile \
+ {debug rust}
set line [gdb_get_line_number "set breakpoint here"]
if {![runto ${srcfile}:$line]} {
diff --git a/gdb/testsuite/gdb.rust/traits.exp b/gdb/testsuite/gdb.rust/traits.exp
index e52749733d7..a614065a129 100644
--- a/gdb/testsuite/gdb.rust/traits.exp
+++ b/gdb/testsuite/gdb.rust/traits.exp
@@ -20,9 +20,8 @@ require allow_rust_tests
require {can_compile rust}
standard_testfile .rs
-if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {
- return -1
-}
+critical prepare_for_testing "failed to prepare" $testfile $srcfile \
+ {debug rust}
set readelf_program [gdb_find_readelf]
set result [catch "exec $readelf_program --debug-dump=info $binfile" output]
diff --git a/gdb/testsuite/gdb.rust/unicode.exp b/gdb/testsuite/gdb.rust/unicode.exp
index 97b37af316a..8063d7ec1b9 100644
--- a/gdb/testsuite/gdb.rust/unicode.exp
+++ b/gdb/testsuite/gdb.rust/unicode.exp
@@ -26,9 +26,8 @@ require {rust_at_least 1.53}
setenv LC_ALL C.UTF-8
standard_testfile .rs
-if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {
- return -1
-}
+critical prepare_for_testing "failed to prepare" $testfile $srcfile \
+ {debug rust}
set line [gdb_get_line_number "set breakpoint here"]
if {![runto ${srcfile}:$line]} {
diff --git a/gdb/testsuite/gdb.rust/union.exp b/gdb/testsuite/gdb.rust/union.exp
index 6074717d276..d4a12156f3e 100644
--- a/gdb/testsuite/gdb.rust/union.exp
+++ b/gdb/testsuite/gdb.rust/union.exp
@@ -20,9 +20,8 @@ require allow_rust_tests
require {can_compile rust}
standard_testfile .rs
-if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {
- return -1
-}
+critical prepare_for_testing "failed to prepare" $testfile $srcfile \
+ {debug rust}
set line [gdb_get_line_number "set breakpoint here"]
if {![runto ${srcfile}:$line]} {
diff --git a/gdb/testsuite/gdb.rust/unsized.exp b/gdb/testsuite/gdb.rust/unsized.exp
index f6d39dd6248..61c671dce6a 100644
--- a/gdb/testsuite/gdb.rust/unsized.exp
+++ b/gdb/testsuite/gdb.rust/unsized.exp
@@ -20,9 +20,8 @@ require allow_rust_tests
require {can_compile rust}
standard_testfile .rs
-if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {
- return -1
-}
+critical prepare_for_testing "failed to prepare" $testfile $srcfile \
+ {debug rust}
set line [gdb_get_line_number "set breakpoint here"]
if {![runto ${srcfile}:$line]} {
diff --git a/gdb/testsuite/gdb.rust/watch.exp b/gdb/testsuite/gdb.rust/watch.exp
index ae359420aad..f9bf6ad2269 100644
--- a/gdb/testsuite/gdb.rust/watch.exp
+++ b/gdb/testsuite/gdb.rust/watch.exp
@@ -20,9 +20,8 @@ require allow_rust_tests
require {can_compile rust}
standard_testfile .rs
-if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} {
- return -1
-}
+critical prepare_for_testing "failed to prepare" $testfile $srcfile \
+ {debug rust}
set line [gdb_get_line_number "set breakpoint here"]
if {![runto ${srcfile}:$line]} {
--
2.39.2
next prev parent reply other threads:[~2023-04-15 15:13 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-15 15:13 [RFC 0/5] Add new "critical" command to test suite Tom Tromey
2023-04-15 15:13 ` [RFC 1/5] Bug fix in prepare_for_testing Tom Tromey
2023-04-15 15:13 ` [RFC 2/5] Introduce the "critical" testsuite command Tom Tromey
2023-04-15 23:35 ` Kevin Buettner
2023-04-15 15:13 ` [RFC 3/5] Use "critical ensure_gdb_index" in gdb.rust Tom Tromey
2023-04-15 15:13 ` Tom Tromey [this message]
2023-04-15 15:13 ` [RFC 5/5] Use "critical runto" " Tom Tromey
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=20230415151336.4104455-5-tom@tromey.com \
--to=tom@tromey.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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).