[binutils-gdb] [gdb/testsuite] Handle USE_TUI in gdb.tui/corefile-run.exp

[binutils-gdb] [gdb/testsuite] Handle USE_TUI in gdb.tui/corefile-run.exp

[Tom de Vries]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=6b81ded4876cb836e5fd7d8bc2459fef99dcac70

commit 6b81ded4876cb836e5fd7d8bc2459fef99dcac70
Author: Tom de Vries <tdevries@suse.de>
Date:   Mon Mar 13 17:20:09 2023 +0100

    [gdb/testsuite] Handle USE_TUI in gdb.tui/corefile-run.exp
    
    Once in a while I find myself rewriting a TUI test-case into a non-TUI
    test-case, to better understand whether the problem I'm looking at is
    related to the TUI or not.
    
    I've got the impression that I've done this sufficiently often that it's worth
    committing the non-TUI version, so having just written a non-TUI version of
    gdb.tui/corefile-run.exp, let's commit it.
    
    The non-TUI version can be enabled by doing:
    ...
    $ make check "RUNTESTFLAGS=gdb.tui/corefile-run.exp USE_TUI=0"
    ...
    
    Also remove hard-coding of a source line number.
    
    Tested on x86_64-linux.

Diff:
---
 gdb/testsuite/gdb.tui/corefile-run.exp | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/gdb/testsuite/gdb.tui/corefile-run.exp b/gdb/testsuite/gdb.tui/corefile-run.exp
index 2109a0ae3eb..6769dfbd800 100644
--- a/gdb/testsuite/gdb.tui/corefile-run.exp
+++ b/gdb/testsuite/gdb.tui/corefile-run.exp
@@ -40,6 +40,19 @@ if { ![gdb_gcore_cmd "$core" "save a corefile"] } {
     return -1
 }
 
+set src_line "return 0;"
+set src_line_nr [gdb_get_line_number $src_line]
+
+set run_re \
+    "\\\[Inferior $decimal \\\(process $decimal\\\) exited normally\\]"
+
+if { [info exists USE_TUI] && $USE_TUI == 0 } {
+    clean_restart $testfile
+    gdb_test "core-file $core" $src_line "load corefile"
+    gdb_test "run" $run_re "run until the end"
+    return
+}
+
 Term::clean_restart 24 80 $testfile
 if {![Term::enter_tui]} {
     unsupported "TUI not supported"
@@ -51,8 +64,7 @@ gdb_assert {![string match "No Source Available" $text]} \
     "initial source listing"
 
 Term::command "core-file $core"
-Term::check_contents "load corefile" "21 *return 0.*$gdb_prompt .*"
+Term::check_contents "load corefile" "$src_line_nr *$src_line.*$gdb_prompt .*"
 
 Term::command "run"
-Term::check_contents "run until the end" \
-    "\\\[Inferior $decimal \\\(process $decimal\\\) exited normally\\]"
+Term::check_contents "run until the end" $run_re