From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2126) id 378433858425; Fri, 13 Jan 2023 20:33:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 378433858425 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1673642036; bh=+41F4R2PP/Jq2g7I2H8hDPR84ywHyHwffrmte/2HElo=; h=From:To:Subject:Date:From; b=EN/Q534B+L02hN6vj8ul4kjWMUX2gfLk4FnWPAAydJVd8zlOHgGZ3m1OD6ERCuzLa lu3DWVpcTsjum8TDA4bDyPqEaApUjkx11NxFZVJ8zNcxltNsx1Aj6z8LAphBSZeWiu e+CpnHuzxaCHxD0FYTmijY13n/gR+/mxKuojx+Zs= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom Tromey To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Don't use ensure_gdb_index with require X-Act-Checkin: binutils-gdb X-Git-Author: Tom Tromey X-Git-Refname: refs/heads/master X-Git-Oldrev: c2a5d74050ea9d7897b4122ef57c627d395683b3 X-Git-Newrev: 15bdcf4ca1514b89c242eccd3a74599bdd00e3e0 Message-Id: <20230113203356.378433858425@sourceware.org> Date: Fri, 13 Jan 2023 20:33:56 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D15bdcf4ca151= 4b89c242eccd3a74599bdd00e3e0 commit 15bdcf4ca1514b89c242eccd3a74599bdd00e3e0 Author: Tom Tromey Date: Wed Dec 14 17:04:35 2022 -0700 Don't use ensure_gdb_index with require =20 This series changes 'require' to take a list of simple predicates. This patch backs out the one use of 'require' that doesn't conform to this -- calling ensure_gdb_index. Diff: --- gdb/testsuite/gdb.base/with-mf.exp | 5 ++++- gdb/testsuite/gdb.dwarf2/gdb-add-index-symlink.exp | 5 ++++- gdb/testsuite/gdb.dwarf2/gdb-add-index.exp | 5 ++++- gdb/testsuite/gdb.dwarf2/gdb-index-types-dwarf5.exp | 5 ++++- gdb/testsuite/gdb.dwarf2/imported-unit-runto-main.exp | 5 ++++- gdb/testsuite/gdb.rust/dwindex.exp | 5 ++++- 6 files changed, 24 insertions(+), 6 deletions(-) diff --git a/gdb/testsuite/gdb.base/with-mf.exp b/gdb/testsuite/gdb.base/wi= th-mf.exp index c16027b6f18..f26d48e1026 100644 --- a/gdb/testsuite/gdb.base/with-mf.exp +++ b/gdb/testsuite/gdb.base/with-mf.exp @@ -24,7 +24,10 @@ if {[prepare_for_testing "failed to prepare" $testfile "= $srcfile $srcfile2" \ return -1 } =20 -require {ensure_gdb_index $binfile} !=3D -1 +if { [ensure_gdb_index $binfile] =3D=3D -1 } { + untested "error adding gdb index" + return -1 +} =20 clean_restart $binfile =20 diff --git a/gdb/testsuite/gdb.dwarf2/gdb-add-index-symlink.exp b/gdb/tests= uite/gdb.dwarf2/gdb-add-index-symlink.exp index e65cc88e427..d8ed180e31b 100644 --- a/gdb/testsuite/gdb.dwarf2/gdb-add-index-symlink.exp +++ b/gdb/testsuite/gdb.dwarf2/gdb-add-index-symlink.exp @@ -29,7 +29,10 @@ with_test_prefix non-symlink { return -1 } =20 - require {ensure_gdb_index $binfile} !=3D -1 + if { [ensure_gdb_index $binfile] =3D=3D -1 } { + untested "error adding gdb index" + return -1 + } } =20 # 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 12dc2c3d2d7..248bb28aabf 100644 --- a/gdb/testsuite/gdb.dwarf2/gdb-add-index.exp +++ b/gdb/testsuite/gdb.dwarf2/gdb-add-index.exp @@ -27,7 +27,10 @@ if { [prepare_for_testing "failed to prepare" "${testfil= e}" \ return -1 } =20 -require {ensure_gdb_index $binfile} !=3D -1 +if { [ensure_gdb_index $binfile] =3D=3D -1 } { + untested "error adding gdb index" + return -1 +} =20 # 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/gdb-index-types-dwarf5.exp b/gdb/test= suite/gdb.dwarf2/gdb-index-types-dwarf5.exp index fc85795b996..2c9f037a80e 100644 --- a/gdb/testsuite/gdb.dwarf2/gdb-index-types-dwarf5.exp +++ b/gdb/testsuite/gdb.dwarf2/gdb-index-types-dwarf5.exp @@ -24,7 +24,10 @@ if { [prepare_for_testing "failed to prepare" ${testfile= } \ return -1 } =20 -require {ensure_gdb_index $binfile} =3D=3D 1 +if { [ensure_gdb_index $binfile] !=3D 1 } { + untested "error adding gdb index" + return -1 +} =20 clean_restart ${binfile} =20 diff --git a/gdb/testsuite/gdb.dwarf2/imported-unit-runto-main.exp b/gdb/te= stsuite/gdb.dwarf2/imported-unit-runto-main.exp index 92573034b9b..09c26ebaaf5 100644 --- a/gdb/testsuite/gdb.dwarf2/imported-unit-runto-main.exp +++ b/gdb/testsuite/gdb.dwarf2/imported-unit-runto-main.exp @@ -74,7 +74,10 @@ if { [prepare_for_testing "failed to prepare" ${testfile= } \ return -1 } =20 -require {ensure_gdb_index $binfile} !=3D -1 +if { [ensure_gdb_index $binfile] =3D=3D -1 } { + untested "error adding gdb index" + return -1 +} =20 clean_restart ${binfile} =20 diff --git a/gdb/testsuite/gdb.rust/dwindex.exp b/gdb/testsuite/gdb.rust/dw= index.exp index 306a7e7b246..4f05cb9eca8 100644 --- a/gdb/testsuite/gdb.rust/dwindex.exp +++ b/gdb/testsuite/gdb.rust/dwindex.exp @@ -26,7 +26,10 @@ if {[prepare_for_testing "failed to prepare" $testfile $= srcfile {debug rust}]} { return -1 } =20 -require {ensure_gdb_index $binfile -dwarf-5} !=3D -1 +if {[ensure_gdb_index $binfile -dwarf-5] =3D=3D -1} { + untested "error adding gdb index" + return -1 +} =20 gdb_exit gdb_start