[PATCH 4/6] [gdb/testsuite] Make ansi-for-tui available in with_tuiterm

[Tom de Vries <tdevries@suse.de>]

Use contrib/ansi-for-tui.sh to create a ansi-for-tui terminfo entry in cached
dir build/gdb/testsuite/cache/terminfo, and make it available in proc
with_tuiterm using TERMINFO.

Tested on x86_64-linux.
---
 gdb/testsuite/lib/gdb.exp     | 16 ++++++++++++++++
 gdb/testsuite/lib/tuiterm.exp | 11 ++++++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 133d914aff8..950a1073f74 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -6578,6 +6578,22 @@ proc cached_file { filename txt {executable 0}} {
     return $filename
 }
 
+# Create a dir with name DIRNAME in the cache directory.  Return a list of:
+# - the full directory name, and
+# - 1 if a new dir was created, otherwise 0.
+
+proc cached_dir { dirname } {
+    set dirname [make_gdb_parallel_path cache $dirname]
+
+    if { [file exists $dirname] } {
+	return [list $dirname 0]
+    }
+
+    file mkdir $dirname
+
+    return [list $dirname 1]
+}
+
 # Return a wrapper around gdb that prevents generating a core file.
 
 proc gdb_no_core { } {
diff --git a/gdb/testsuite/lib/tuiterm.exp b/gdb/testsuite/lib/tuiterm.exp
index e52cb3e5b6d..4c0fdc9b6df 100644
--- a/gdb/testsuite/lib/tuiterm.exp
+++ b/gdb/testsuite/lib/tuiterm.exp
@@ -801,7 +801,16 @@ namespace eval Term {
     # BODY.
     proc with_tuiterm {rows cols body} {
 	global env stty_init
-	save_vars {env(TERM) stty_init} {
+
+	set res [cached_dir terminfo]
+	set terminfo [lindex $res 0]
+	set dir_created [lindex $res 1]
+	if { $dir_created } {
+	    exec $::srcdir/../contrib/ansi-for-tui.sh -o $terminfo
+	}
+
+	save_vars {env(TERM) env(TERMINFO) stty_init} {
+	    setenv TERMINFO $terminfo
 	    setenv TERM ansi
 	    _setup $rows $cols
 
-- 
2.35.3