* [committed][gdb/testsuite] Use early-out style in gdb.base/break-probes.exp
@ 2021-09-23 20:42 Tom de Vries via Gdb-patches
0 siblings, 0 replies; only message in thread
From: Tom de Vries via Gdb-patches @ 2021-09-23 20:42 UTC (permalink / raw)
To: gdb-patches
Hi,
Reduce indentation and improve readability in test-case
gdb.base/break-probes.exp by replacing:
...
if { <cond> } {
<lots-of-code>
}
...
with:
...
if { ! <cond> } {
return -1
}
<lots-of-code>
...
Tested on x86_64-linux.
Committed to trunk.
Thanks,
- Tom
[gdb/testsuite] Use early-out style in gdb.base/break-probes.exp
---
gdb/testsuite/gdb.base/break-probes.exp | 52 +++++++++++++++++----------------
1 file changed, 27 insertions(+), 25 deletions(-)
diff --git a/gdb/testsuite/gdb.base/break-probes.exp b/gdb/testsuite/gdb.base/break-probes.exp
index 2a590de8139..e11591798df 100644
--- a/gdb/testsuite/gdb.base/break-probes.exp
+++ b/gdb/testsuite/gdb.base/break-probes.exp
@@ -60,34 +60,36 @@ gdb_test_multiple "bt" $test {
}
}
-if { $using_probes } {
- set sysroot ""
- set test "show sysroot"
- gdb_test_multiple $test $test {
- -re "The current system root is \"(.*)\"\..*${gdb_prompt} $" {
- set sysroot $expect_out(1,string)
- }
+if { ! $using_probes } {
+ return -1
+}
+
+set sysroot ""
+set test "show sysroot"
+gdb_test_multiple $test $test {
+ -re "The current system root is \"(.*)\"\..*${gdb_prompt} $" {
+ set sysroot $expect_out(1,string)
}
+}
- # GDB strips "target:" from the start of filenames
- # when operating on the local filesystem
- regsub "^target:" "$sysroot" "(target:)?" sysroot
+# GDB strips "target:" from the start of filenames
+# when operating on the local filesystem
+regsub "^target:" "$sysroot" "(target:)?" sysroot
- # Run til it loads our library
- set test "run til our library loads"
- set not_loaded_library 1
- while { $not_loaded_library } {
- set not_loaded_library 0
- gdb_test_multiple "c" $test {
- -re "Inferior loaded $sysroot$binfile_lib\\M.*$gdb_prompt $" {
- pass $test
- }
- -re "Stopped due to shared library event\\M.*$gdb_prompt $" {
- set not_loaded_library 1
- }
+# Run til it loads our library
+set test "run til our library loads"
+set not_loaded_library 1
+while { $not_loaded_library } {
+ set not_loaded_library 0
+ gdb_test_multiple "c" $test {
+ -re "Inferior loaded $sysroot$binfile_lib\\M.*$gdb_prompt $" {
+ pass $test
+ }
+ -re "Stopped due to shared library event\\M.*$gdb_prompt $" {
+ set not_loaded_library 1
}
}
-
- # Call something to ensure that relocation occurred
- gdb_test "call (int) foo(23)" "\\\$.* = 31.*\\\M.*"
}
+
+# Call something to ensure that relocation occurred
+gdb_test "call (int) foo(23)" "\\\$.* = 31.*\\\M.*"
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-09-23 20:43 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-23 20:42 [committed][gdb/testsuite] Use early-out style in gdb.base/break-probes.exp Tom de Vries via Gdb-patches
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox