aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Burgess <andrew.burgess@embecosm.com>2021-05-13 16:50:28 +0100
committerAndrew Burgess <andrew.burgess@embecosm.com>2021-05-13 17:48:49 +0100
commit5c6f801d8e6740d9c1dfa7ff4a9ed2ec160a5e1d (patch)
treed7212f1b407ab925d3abc640f8734950d714fd71
parent0b2256f772883cf5ea9fecb0d720ca8ea8629198 (diff)
downloadgdb-5c6f801d8e6740d9c1dfa7ff4a9ed2ec160a5e1d.zip
gdb-5c6f801d8e6740d9c1dfa7ff4a9ed2ec160a5e1d.tar.gz
gdb-5c6f801d8e6740d9c1dfa7ff4a9ed2ec160a5e1d.tar.bz2
gdb/testsuite: remove some duplicate test names from guile tests
The guile support library has some "tests" that are actually being used to setup GDB ready for the real guile tests, e.g. we load some support modules, and define some helper functions. As this setup is done every time we call gdb_guile_runto_main, which could be called multiple times in a single test script, this can lead to duplicate PASS lines. As this setup is all pretty basic, and isn't the actual focus of the real tests, then in this commit I pass an empty test name through to the gdb_test_no_output calls, the result of this is that the PASS lines are no longer printed. This removes some duplicate tests from the gdb.guile/*.exp set of tests. gdb/testsuite/ChangeLog: * lib/guile.exp (gdb_scm_load_file): Use empty test name to silence PASS lines. (gdb_install_guile_module): Likewise.
-rw-r--r--gdb/testsuite/ChangeLog6
-rw-r--r--gdb/testsuite/lib/gdb-guile.exp15
2 files changed, 18 insertions, 3 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index e0f6496..afcf2ac 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2021-05-10 Andrew Burgess <andrew.burgess@embecosm.com>
+
+ * lib/guile.exp (gdb_scm_load_file): Use empty test name to
+ silence PASS lines.
+ (gdb_install_guile_module): Likewise.
+
2021-05-12 George Barrett <bob@bob131.so>
* gdb.guile/scm-value.exp (test_value_in_inferior): Add test for
diff --git a/gdb/testsuite/lib/gdb-guile.exp b/gdb/testsuite/lib/gdb-guile.exp
index f6e627e..c118ffe 100644
--- a/gdb/testsuite/lib/gdb-guile.exp
+++ b/gdb/testsuite/lib/gdb-guile.exp
@@ -81,14 +81,23 @@ proc gdb_scm_load_file { file_name {test_name ""} } {
proc gdb_install_guile_utils { } {
# Define utilities in Guile to save needing (newline) all the time,
# and in the case of "print" add a prefix to help erroneous passes.
- gdb_test_no_output "guile (define (print x) (format #t \"= ~A\" x) (newline))"
- gdb_test_no_output "guile (define (raw-print x) (format #t \"= ~S\" x) (newline))"
+ #
+ # Pass the empty string as the test name here, this means we don't
+ # get a pass/fail message for these tests, but also removes
+ # duplicate tests if this proc ends up getting called multiple
+ # times in a single test script.
+ gdb_test_no_output "guile (define (print x) (format #t \"= ~A\" x) (newline))" ""
+ gdb_test_no_output "guile (define (raw-print x) (format #t \"= ~S\" x) (newline))" ""
}
# Install the gdb module.
proc gdb_install_guile_module { } {
- gdb_test_no_output "guile (use-modules (gdb))"
+ # Pass the empty string as the test name here, this means we don't
+ # get a pass/fail message for these tests, but also removes
+ # duplicate tests if this proc ends up getting called multiple
+ # times in a single test script.
+ gdb_test_no_output "guile (use-modules (gdb))" ""
}
# Wrapper around runto_main that installs the guile utils and module.