From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH v2 02/79] Change 'require' to accept a list of predicates
Date: Wed, 11 Jan 2023 19:59:35 -0700 [thread overview]
Message-ID: <20230112030052.3306113-3-tom@tromey.com> (raw)
In-Reply-To: <20230112030052.3306113-1-tom@tromey.com>
This changes 'require' to accept a list of simple predicates. For
now, each predicate is just the name of a proc, optionally prefixed
with "!" to indicate that the result should be inverted.
It's possible to make this fancier, but so far I haven't done so. One
idea I had is to allow a predicate to have associated text to display
on failure. Another is to convert the predicates that need a running
gdb (e.g., skip_python_tests) to start their own gdb, and then
'require' could enforce the rule that gdb not be running when it is
called.
---
gdb/testsuite/gdb.base/valgrind-bt.exp | 2 +-
gdb/testsuite/gdb.base/valgrind-disp-step.exp | 2 +-
gdb/testsuite/gdb.base/valgrind-infcall-2.exp | 2 +-
gdb/testsuite/gdb.base/valgrind-infcall.exp | 2 +-
gdb/testsuite/gdb.dwarf2/dw2-lines.exp | 2 +-
.../gdb.dwarf2/dw2-symtab-includes-lookup.exp | 2 +-
.../frame-inlined-in-outer-frame.exp | 2 +-
gdb/testsuite/gdb.mi/mi-async.exp | 2 +-
gdb/testsuite/gdb.reverse/insn-reverse.exp | 2 +-
gdb/testsuite/gdb.tui/tui-missing-src.exp | 2 +-
gdb/testsuite/lib/gdb.exp | 51 ++++++++-----------
11 files changed, 30 insertions(+), 41 deletions(-)
diff --git a/gdb/testsuite/gdb.base/valgrind-bt.exp b/gdb/testsuite/gdb.base/valgrind-bt.exp
index d139d374def..049b42f9b1e 100644
--- a/gdb/testsuite/gdb.base/valgrind-bt.exp
+++ b/gdb/testsuite/gdb.base/valgrind-bt.exp
@@ -14,7 +14,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Valgrind gdbserver requires gdb with xml support.
-require gdb_skip_xml_test 0
+require !gdb_skip_xml_test
load_lib valgrind.exp
diff --git a/gdb/testsuite/gdb.base/valgrind-disp-step.exp b/gdb/testsuite/gdb.base/valgrind-disp-step.exp
index 99ba29b8929..05d0d8d6951 100644
--- a/gdb/testsuite/gdb.base/valgrind-disp-step.exp
+++ b/gdb/testsuite/gdb.base/valgrind-disp-step.exp
@@ -19,7 +19,7 @@
# automatically instead of getting stuck or crashing.
# Valgrind gdbserver requires gdb with xml support.
-require gdb_skip_xml_test 0
+require !gdb_skip_xml_test
load_lib valgrind.exp
diff --git a/gdb/testsuite/gdb.base/valgrind-infcall-2.exp b/gdb/testsuite/gdb.base/valgrind-infcall-2.exp
index c85abd8d272..13d290079cc 100644
--- a/gdb/testsuite/gdb.base/valgrind-infcall-2.exp
+++ b/gdb/testsuite/gdb.base/valgrind-infcall-2.exp
@@ -30,7 +30,7 @@
# Aborted (core dumped)
# Valgrind gdbserver requires gdb with xml support.
-require gdb_skip_xml_test 0
+require !gdb_skip_xml_test
load_lib valgrind.exp
diff --git a/gdb/testsuite/gdb.base/valgrind-infcall.exp b/gdb/testsuite/gdb.base/valgrind-infcall.exp
index 3f7f81d9c21..48b3bb2c6c1 100644
--- a/gdb/testsuite/gdb.base/valgrind-infcall.exp
+++ b/gdb/testsuite/gdb.base/valgrind-infcall.exp
@@ -14,7 +14,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Valgrind gdbserver requires gdb with xml support.
-require gdb_skip_xml_test 0
+require !gdb_skip_xml_test
load_lib valgrind.exp
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-lines.exp b/gdb/testsuite/gdb.dwarf2/dw2-lines.exp
index 198d752606c..658d1f69a18 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-lines.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-lines.exp
@@ -18,7 +18,7 @@
load_lib dwarf.exp
# This test can only be run on targets which support DWARF-2 and use gas.
-require dwarf2_support 1
+require dwarf2_support
standard_testfile .c
diff --git a/gdb/testsuite/gdb.dwarf2/dw2-symtab-includes-lookup.exp b/gdb/testsuite/gdb.dwarf2/dw2-symtab-includes-lookup.exp
index 6ae2035b37c..d870275c3c6 100644
--- a/gdb/testsuite/gdb.dwarf2/dw2-symtab-includes-lookup.exp
+++ b/gdb/testsuite/gdb.dwarf2/dw2-symtab-includes-lookup.exp
@@ -40,7 +40,7 @@
load_lib dwarf.exp
# This test can only be run on targets which support DWARF-2 and use gas.
-require dwarf2_support 1
+require dwarf2_support
standard_testfile main.c .S
diff --git a/gdb/testsuite/gdb.dwarf2/frame-inlined-in-outer-frame.exp b/gdb/testsuite/gdb.dwarf2/frame-inlined-in-outer-frame.exp
index fbce42b1a25..0915ee4de13 100644
--- a/gdb/testsuite/gdb.dwarf2/frame-inlined-in-outer-frame.exp
+++ b/gdb/testsuite/gdb.dwarf2/frame-inlined-in-outer-frame.exp
@@ -26,7 +26,7 @@
# directives.
# Check if starti command is supported.
-require use_gdb_stub 0
+require !use_gdb_stub
load_lib dwarf.exp
diff --git a/gdb/testsuite/gdb.mi/mi-async.exp b/gdb/testsuite/gdb.mi/mi-async.exp
index 0b8349913dd..880db6de68b 100644
--- a/gdb/testsuite/gdb.mi/mi-async.exp
+++ b/gdb/testsuite/gdb.mi/mi-async.exp
@@ -26,7 +26,7 @@ if {!([isnative] && [istarget *-linux*])} {
}
# Check if start command is supported.
-require use_gdb_stub 0
+require !use_gdb_stub
# The plan is for async mode to become the default but toggle for now.
set saved_gdbflags $GDBFLAGS
diff --git a/gdb/testsuite/gdb.reverse/insn-reverse.exp b/gdb/testsuite/gdb.reverse/insn-reverse.exp
index 9cefea93108..a7322067922 100644
--- a/gdb/testsuite/gdb.reverse/insn-reverse.exp
+++ b/gdb/testsuite/gdb.reverse/insn-reverse.exp
@@ -18,7 +18,7 @@ if ![supports_reverse] {
}
# Check if start command is supported.
-require use_gdb_stub 0
+require !use_gdb_stub
standard_testfile
diff --git a/gdb/testsuite/gdb.tui/tui-missing-src.exp b/gdb/testsuite/gdb.tui/tui-missing-src.exp
index b373aadadc3..7dd8324f277 100644
--- a/gdb/testsuite/gdb.tui/tui-missing-src.exp
+++ b/gdb/testsuite/gdb.tui/tui-missing-src.exp
@@ -26,7 +26,7 @@
# 7. Going back to main() shall result in no contents again.
# Check if start command is supported.
-require use_gdb_stub 0
+require !use_gdb_stub
tuiterm_env
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 39dfa67c344..88dfdafb654 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -9061,41 +9061,30 @@ gdb_caching_proc have_avx {
return $status
}
-# Called as either:
-# - require EXPR VAL
-# - require EXPR OP VAL
-# In the first case, OP is ==.
-#
-# Require EXPR OP VAL, where EXPR is evaluated in caller context. If not,
-# return in the caller's context.
-
-proc require { fn arg1 {arg2 ""} } {
- if { $arg2 == "" } {
- set op ==
- set val $arg1
- } else {
- set op $arg1
- set val $arg2
- }
- set res [uplevel 1 $fn]
- if { [expr $res $op $val] } {
- return
- }
+# Called as
+# - require ARG...
+#
+# ARG can either be a name, or of the form !NAME.
+#
+# Each name is a proc to evaluate in the caller's context. It returns
+# a boolean, and a "!" means to invert the result. If this is
+# nonzero, all is well. If it is zero, an "untested" is emitted and
+# this proc causes the caller to return.
- 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"
+proc require { args } {
+ foreach arg $args {
+ if {[string index $arg 0] == "!"} {
+ set ok 0
+ set fn [string range $arg 1 end]
+ } else {
+ set ok 1
+ set fn $arg
}
- "use_gdb_stub == 0" {
- set msg "Remote stub used"
+ if {$ok != !![uplevel 1 $fn]} {
+ untested "require failed: $arg"
+ return -code return 0
}
- default { set msg "$fn != $val" }
}
-
- untested $msg
- return -code return 0
}
# Wait up to ::TIMEOUT seconds for file PATH to exist on the target system.
--
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 ` [PATCH v2 01/79] Don't use ensure_gdb_index with require Tom Tromey
2023-01-12 2:59 ` Tom Tromey [this message]
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-3-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).