diff options
| -rw-r--r-- | gdb/testsuite/gdb.base/with-mf.exp | 4 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.dwarf2/gdb-add-index-symlink.exp | 4 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.dwarf2/gdb-add-index.exp | 4 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.dwarf2/imported-unit-runto-main.exp | 4 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.rust/dwindex.exp | 4 | ||||
| -rw-r--r-- | gdb/testsuite/lib/gdb.exp | 4 |
6 files changed, 9 insertions, 15 deletions
diff --git a/gdb/testsuite/gdb.base/with-mf.exp b/gdb/testsuite/gdb.base/with-mf.exp index d0667b3..a0f5b27 100644 --- a/gdb/testsuite/gdb.base/with-mf.exp +++ b/gdb/testsuite/gdb.base/with-mf.exp @@ -24,9 +24,7 @@ if {[prepare_for_testing "failed to prepare" $testfile "$srcfile $srcfile2" \ return -1 } -if { [ensure_gdb_index $binfile] == -1 } { - return -1 -} +require {ensure_gdb_index $binfile} != -1 clean_restart $binfile diff --git a/gdb/testsuite/gdb.dwarf2/gdb-add-index-symlink.exp b/gdb/testsuite/gdb.dwarf2/gdb-add-index-symlink.exp index 74c558a..3f09aa8 100644 --- a/gdb/testsuite/gdb.dwarf2/gdb-add-index-symlink.exp +++ b/gdb/testsuite/gdb.dwarf2/gdb-add-index-symlink.exp @@ -29,9 +29,7 @@ with_test_prefix non-symlink { return -1 } - if { [ensure_gdb_index $binfile] == -1 } { - return -1 - } + require {ensure_gdb_index $binfile} != -1 } # Regenerate exec without index. diff --git a/gdb/testsuite/gdb.dwarf2/gdb-add-index.exp b/gdb/testsuite/gdb.dwarf2/gdb-add-index.exp index 2a83eb1..17c278e 100644 --- a/gdb/testsuite/gdb.dwarf2/gdb-add-index.exp +++ b/gdb/testsuite/gdb.dwarf2/gdb-add-index.exp @@ -27,9 +27,7 @@ if { [prepare_for_testing "failed to prepare" "${testfile}" \ return -1 } -if { [ensure_gdb_index $binfile] == -1 } { - return -1 -} +require {ensure_gdb_index $binfile} != -1 # Ok, we have a copy of $binfile with an index. # Restart gdb and verify the index was used. diff --git a/gdb/testsuite/gdb.dwarf2/imported-unit-runto-main.exp b/gdb/testsuite/gdb.dwarf2/imported-unit-runto-main.exp index 9034f4c..b3a7005 100644 --- a/gdb/testsuite/gdb.dwarf2/imported-unit-runto-main.exp +++ b/gdb/testsuite/gdb.dwarf2/imported-unit-runto-main.exp @@ -74,9 +74,7 @@ if { [prepare_for_testing "failed to prepare" ${testfile} \ return -1 } -if { [ensure_gdb_index $binfile] == -1 } { - return -1 -} +require {ensure_gdb_index $binfile} != -1 clean_restart ${binfile} diff --git a/gdb/testsuite/gdb.rust/dwindex.exp b/gdb/testsuite/gdb.rust/dwindex.exp index 1bc6199..07de0b4 100644 --- a/gdb/testsuite/gdb.rust/dwindex.exp +++ b/gdb/testsuite/gdb.rust/dwindex.exp @@ -26,9 +26,7 @@ if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug rust}]} { return -1 } -if {[ensure_gdb_index $binfile "-dwarf-5"] == -1} { - return -1 -} +require {ensure_gdb_index $binfile -dwarf-5} != -1 gdb_exit gdb_start diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index c2e6595..90131fe 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -8247,6 +8247,10 @@ proc require { fn arg1 {arg2 ""} } { switch "$fn $op $val" { "gdb_skip_xml_test == 0" { set msg "missing xml support" } + "ensure_gdb_index $binfile != -1" - + "ensure_gdb_index $binfile -dwarf-5 != -1" { + set msg "Couldn't ensure index in binfile" + } default { set msg "$fn != $val" } } |