From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH v2 01/79] Don't use ensure_gdb_index with require
Date: Wed, 11 Jan 2023 19:59:34 -0700 [thread overview]
Message-ID: <20230112030052.3306113-2-tom@tromey.com> (raw)
In-Reply-To: <20230112030052.3306113-1-tom@tromey.com>
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.
---
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/with-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
}
-require {ensure_gdb_index $binfile} != -1
+if { [ensure_gdb_index $binfile] == -1 } {
+ untested "error adding gdb index"
+ return -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 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
}
- require {ensure_gdb_index $binfile} != -1
+ if { [ensure_gdb_index $binfile] == -1 } {
+ untested "error adding gdb index"
+ return -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 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" "${testfile}" \
return -1
}
-require {ensure_gdb_index $binfile} != -1
+if { [ensure_gdb_index $binfile] == -1 } {
+ untested "error adding gdb index"
+ return -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/gdb-index-types-dwarf5.exp b/gdb/testsuite/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
}
-require {ensure_gdb_index $binfile} == 1
+if { [ensure_gdb_index $binfile] != 1 } {
+ untested "error adding gdb index"
+ return -1
+}
clean_restart ${binfile}
diff --git a/gdb/testsuite/gdb.dwarf2/imported-unit-runto-main.exp b/gdb/testsuite/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
}
-require {ensure_gdb_index $binfile} != -1
+if { [ensure_gdb_index $binfile] == -1 } {
+ untested "error adding gdb index"
+ return -1
+}
clean_restart ${binfile}
diff --git a/gdb/testsuite/gdb.rust/dwindex.exp b/gdb/testsuite/gdb.rust/dwindex.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
}
-require {ensure_gdb_index $binfile -dwarf-5} != -1
+if {[ensure_gdb_index $binfile -dwarf-5] == -1} {
+ untested "error adding gdb index"
+ return -1
+}
gdb_exit
gdb_start
--
2.39.0
next prev parent reply other threads:[~2023-01-12 3:01 UTC|newest]
Thread overview: 91+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-12 2:59 [PATCH v2 00/79] Rewrite "require" test procedure and use it more often Tom Tromey
2023-01-12 2:59 ` Tom Tromey [this message]
2023-01-12 2:59 ` [PATCH v2 02/79] Change 'require' to accept a list of predicates Tom Tromey
2023-01-12 2:59 ` [PATCH v2 03/79] Use unsupported in 'require' Tom Tromey
2023-01-12 2:59 ` [PATCH v2 04/79] Use require supports_reverse Tom Tromey
2023-01-12 2:59 ` [PATCH v2 05/79] Use require supports_process_record Tom Tromey
2023-01-12 2:59 ` [PATCH v2 06/79] Use require dwarf2_support Tom Tromey
2023-01-12 2:59 ` [PATCH v2 07/79] Use require is_x86_like_target Tom Tromey
2023-01-12 2:59 ` [PATCH v2 08/79] Use require skip_cplus_tests Tom Tromey
2023-01-12 3:56 ` Kevin Buettner
2023-01-12 2:59 ` [PATCH v2 09/79] Use require skip_shlib_tests Tom Tromey
2023-01-12 2:59 ` [PATCH v2 10/79] Use require skip_dlmopen_tests Tom Tromey
2023-01-12 2:59 ` [PATCH v2 11/79] Use require skip_stl_tests Tom Tromey
2023-01-12 2:59 ` [PATCH v2 12/79] Use require skip_rust_tests Tom Tromey
2023-01-12 2:59 ` [PATCH v2 13/79] Use require skip_fortran_tests Tom Tromey
2023-01-12 2:59 ` [PATCH v2 14/79] Use require skip_ada_tests Tom Tromey
2023-01-12 2:59 ` [PATCH v2 15/79] Use require skip_go_tests Tom Tromey
2023-01-12 2:59 ` [PATCH v2 16/79] Use require skip_d_tests Tom Tromey
2023-01-12 2:59 ` [PATCH v2 17/79] Use require skip_ctf_tests Tom Tromey
2023-01-12 2:59 ` [PATCH v2 18/79] Use require skip_hw_watchpoint_tests Tom Tromey
2023-01-12 2:59 ` [PATCH v2 19/79] Use require skip_ifunc_tests Tom Tromey
2023-01-12 2:59 ` [PATCH v2 20/79] Use require skip_aarch64_sve_tests Tom Tromey
2023-01-12 2:59 ` [PATCH v2 21/79] Use require skip_btrace_pt_tests Tom Tromey
2023-01-12 2:59 ` [PATCH v2 22/79] Use require skip_btrace_tests Tom Tromey
2023-01-12 2:59 ` [PATCH v2 23/79] Use require skip_avx_* Tom Tromey
2023-01-12 2:59 ` [PATCH v2 24/79] Use require support_displaced_stepping Tom Tromey
2023-01-12 2:59 ` [PATCH v2 25/79] Use require is_aarch64_target Tom Tromey
2023-01-12 2:59 ` [PATCH v2 26/79] Use require is_aarch32_target Tom Tromey
2023-01-12 3:00 ` [PATCH v2 27/79] Use require is_amd64_regs_target Tom Tromey
2023-01-12 3:00 ` [PATCH v2 28/79] Use require is_elf_target Tom Tromey
2023-01-12 3:00 ` [PATCH v2 29/79] Use require can_single_step_to_signal_handler Tom Tromey
2023-01-12 3:00 ` [PATCH v2 30/79] Use require supports_get_siginfo_type Tom Tromey
2023-01-12 3:00 ` [PATCH v2 31/79] Use require support_go_compile Tom Tromey
2023-01-12 3:00 ` [PATCH v2 32/79] Use require use_gdb_stub Tom Tromey
2023-01-12 3:00 ` [PATCH v2 33/79] Use require can_spawn_for_attach Tom Tromey
2023-01-12 3:00 ` [PATCH v2 34/79] Use require isnative Tom Tromey
2023-01-12 3:00 ` [PATCH v2 35/79] Use require skip_gdbserver_tests Tom Tromey
2023-01-12 3:00 ` [PATCH v2 36/79] Use require skip_shlib_tests Tom Tromey
2023-01-12 3:00 ` [PATCH v2 37/79] Use require is_c_compiler_gcc Tom Tromey
2023-01-12 3:00 ` [PATCH v2 38/79] Use require gdb_debug_enabled Tom Tromey
2023-01-12 3:00 ` [PATCH v2 39/79] Use require gdb_skip_xml_test Tom Tromey
2023-01-12 3:00 ` [PATCH v2 40/79] Use require gdb_trace_common_supports_arch Tom Tromey
2023-01-12 3:00 ` [PATCH v2 41/79] Use require skip_perf_tests Tom Tromey
2023-01-12 3:00 ` [PATCH v2 42/79] Use require skip_opencl_tests Tom Tromey
2023-01-12 3:00 ` [PATCH v2 43/79] Use require target_can_use_run_cmd Tom Tromey
2023-01-12 3:00 ` [PATCH v2 44/79] Use require using_fission Tom Tromey
2023-01-12 3:00 ` [PATCH v2 45/79] Use require skip_debuginfod_tests Tom Tromey
2023-01-12 3:00 ` [PATCH v2 46/79] Use require gnat_runtime_has_debug_info Tom Tromey
2023-01-12 3:00 ` [PATCH v2 47/79] Rewrite skip_python_tests Tom Tromey
2023-01-12 3:00 ` [PATCH v2 48/79] Remove mi_skip_python_tests Tom Tromey
2023-01-12 3:00 ` [PATCH v2 49/79] Fix latent bug in default_prompt_gdb_start Tom Tromey
2023-01-12 3:00 ` [PATCH v2 50/79] Use "require" for Python tests Tom Tromey
2023-01-12 3:00 ` [PATCH v2 51/79] Rename to allow_xml_test Tom Tromey
2023-01-12 3:00 ` [PATCH v2 52/79] Rename to allow_aarch64_sve_tests Tom Tromey
2023-01-12 3:00 ` [PATCH v2 53/79] Rename to allow_ada_tests Tom Tromey
2023-01-12 3:00 ` [PATCH v2 54/79] Rename to allow_avx512bf16_tests Tom Tromey
2023-01-12 3:00 ` [PATCH v2 55/79] Rename to allow_avx512fp16_tests Tom Tromey
2023-01-12 3:00 ` [PATCH v2 56/79] Rename to allow_btrace_pt_tests Tom Tromey
2023-01-12 3:00 ` [PATCH v2 57/79] Rename to allow_btrace_tests Tom Tromey
2023-01-12 6:39 ` Metzger, Markus T
2023-01-12 3:00 ` [PATCH v2 58/79] Rename to allow_cplus_tests and allow_stl_tests Tom Tromey
2023-01-12 3:00 ` [PATCH v2 59/79] Rename to allow_ctf_tests Tom Tromey
2023-01-12 3:00 ` [PATCH v2 60/79] Rename to allow_debuginfod_tests Tom Tromey
2023-01-12 3:00 ` [PATCH v2 61/79] Rename to allow_dlmopen_tests Tom Tromey
2023-01-12 3:00 ` [PATCH v2 62/79] Rename to allow_d_tests Tom Tromey
2023-01-12 3:00 ` [PATCH v2 63/79] Rename to allow_fortran_tests Tom Tromey
2023-01-12 3:00 ` [PATCH v2 64/79] Rename to allow_gdbserver_tests Tom Tromey
2023-01-12 3:00 ` [PATCH v2 65/79] Rename to allow_go_tests Tom Tromey
2023-01-12 3:00 ` [PATCH v2 66/79] Rename to allow_hw_watchpoint_access_tests Tom Tromey
2023-01-12 3:00 ` [PATCH v2 67/79] Rename to allow_hw_watchpoint_multi_tests Tom Tromey
2023-01-12 3:00 ` [PATCH v2 68/79] Rename to allow_hw_watchpoint_tests Tom Tromey
2023-01-12 3:00 ` [PATCH v2 69/79] Rename to allow_ifunc_tests Tom Tromey
2023-01-12 3:00 ` [PATCH v2 70/79] Rename to allow_opencl_tests Tom Tromey
2023-01-12 3:00 ` [PATCH v2 71/79] Rename to allow_perf_tests Tom Tromey
2023-01-12 3:00 ` [PATCH v2 72/79] Rename to allow_python_tests Tom Tromey
2023-01-12 3:00 ` [PATCH v2 73/79] Rename to allow_rust_tests Tom Tromey
2023-01-12 3:00 ` [PATCH v2 74/79] Rename to allow_shlib_tests Tom Tromey
2023-01-12 3:00 ` [PATCH v2 75/79] Rename to allow_tsx_tests Tom Tromey
2023-01-12 3:00 ` [PATCH v2 76/79] Rename to allow_hw_breakpoint_tests Tom Tromey
2023-01-12 3:00 ` [PATCH v2 77/79] Rename to allow_guile_tests Tom Tromey
2023-01-14 16:22 ` Tom de Vries
2023-01-14 19:50 ` Tom Tromey
2023-01-12 3:00 ` [PATCH v2 78/79] Rename to allow_tui_tests Tom Tromey
2023-01-12 3:00 ` [PATCH v2 79/79] Consolidate calls to require Tom Tromey
2023-01-13 12:48 ` Pedro Alves
2023-01-13 14:07 ` Tom Tromey
2023-01-13 14:45 ` Pedro Alves
2023-01-13 19:13 ` Tom Tromey
2023-01-12 4:45 ` [PATCH v2 00/79] Rewrite "require" test procedure and use it more often Kevin Buettner
2023-01-13 3:51 ` Tom Tromey
2023-01-13 20:18 ` 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=20230112030052.3306113-2-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).