[RFC,4/5] Use "critical prepare_for_testing" in gdb.rust
Commit Message
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(-)
@@ -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]} {
@@ -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
@@ -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]} {
@@ -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]} {
@@ -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]} {
@@ -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.
@@ -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]} {
@@ -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]} {
@@ -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]} {
@@ -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]
@@ -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]} {
@@ -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} {
@@ -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]} {
@@ -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]} {
@@ -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]
@@ -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]} {
@@ -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]} {
@@ -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]} {
@@ -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]} {