From 18125b163947bfd0c358d4a5acf4e0e3b43b64cf Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@adacore.com>
Date: Tue, 14 May 2019 08:04:22 -0600
Subject: Add "style" proc to the test suite

This adds a "style" helper proc to the test suite, and updates
existing style tests to use it.  Thanks to Sergio for the idea.

Tested on x86-64 Fedora 29.

gdb/testsuite/ChangeLog
2019-05-22  Tom Tromey  <tromey@adacore.com>

	* gdb.base/info-shared.exp (check_info_shared): Use "style".
	* gdb.base/style.exp: Use "style".
	* lib/gdb-utils.exp (style): New proc.
---
 gdb/testsuite/ChangeLog                |  6 ++++++
 gdb/testsuite/gdb.base/info-shared.exp |  6 ++++--
 gdb/testsuite/gdb.base/style.exp       | 13 +++++++------
 gdb/testsuite/lib/gdb-utils.exp        | 18 ++++++++++++++++++
 4 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 2f90b87..2950a41 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2019-05-22  Tom Tromey  <tromey@adacore.com>
+
+	* gdb.base/info-shared.exp (check_info_shared): Use "style".
+	* gdb.base/style.exp: Use "style".
+	* lib/gdb-utils.exp (style): New proc.
+
 2019-05-22  Tom de Vries  <tdevries@suse.de>
 
 	* gdb.base/align.exp: Require c++11.
diff --git a/gdb/testsuite/gdb.base/info-shared.exp b/gdb/testsuite/gdb.base/info-shared.exp
index e1314bf..c21f3c3 100644
--- a/gdb/testsuite/gdb.base/info-shared.exp
+++ b/gdb/testsuite/gdb.base/info-shared.exp
@@ -161,8 +161,10 @@ with_test_prefix styled {
 
 	# Simple test for "info sharedlibrary" styling.  Look for styled
 	# addresses and file name.
-	set addr "\033\\\[34m${hex}\033\\\[m"
-	set sofile "\033\\\[32m\[^\033\]+\033\\\[m"
+	set addr [style $hex address]
+	# Use a non-greedy match here to avoid accidentally picking up
+	# other escape sequences.
+	set sofile [style ".*?" file]
 	gdb_test_no_output "set style enabled on"
 	gdb_test "info sharedlibrary" \
 	    "$addr\[ \t\]+$addr.*$sofile\r\n.*"
diff --git a/gdb/testsuite/gdb.base/style.exp b/gdb/testsuite/gdb.base/style.exp
index 369c1f5..15de05c 100644
--- a/gdb/testsuite/gdb.base/style.exp
+++ b/gdb/testsuite/gdb.base/style.exp
@@ -41,10 +41,10 @@ save_vars { env(TERM) } {
 
     gdb_test_no_output "set style enabled on"
 
-    set main_expr "\033\\\[33mmain\033\\\[m"
-    set base_file_expr "\033\\\[32m.*style\\.c\033\\\[m"
+    set main_expr [style main function]
+    set base_file_expr [style ".*style\\.c" file]
     set file_expr "$base_file_expr:\[0-9\]"
-    set arg_expr "\033\\\[36marg.\033\\\[m"
+    set arg_expr [style "arg." variable]
 
     gdb_test "frame" \
 	"$main_expr.*$arg_expr.*$arg_expr.*$file_expr.*"
@@ -58,7 +58,7 @@ save_vars { env(TERM) } {
 
     gdb_test "break main" "file $base_file_expr.*"
 
-    gdb_test "print &main" " = .* \033\\\[34m$hex\033\\\[m <$main_expr>"
+    gdb_test "print &main" " = .* [style $hex address] <$main_expr>"
 
     # Regression test for a bug where line-wrapping would occur at the
     # wrong spot with styling.  There were different bugs at different
@@ -86,11 +86,12 @@ save_vars { env(TERM) } {
     gdb_exit
     gdb_spawn
 
-    gdb_test "" "\033\\\[35;1mGNU gdb.*\033\\\[m.*" \
+    set vers [style "GNU gdb.*" "35;1"]
+    gdb_test "" "${vers}.*" \
 	"version is styled"
 
     set quoted [string_to_regexp $binfile]
     gdb_test "file $binfile" \
-	"Reading symbols from \033\\\[32m${quoted}\033\\\[m..." \
+	"Reading symbols from [style $quoted file]..." \
 	"filename is styled when loading symbol file"
 }
diff --git a/gdb/testsuite/lib/gdb-utils.exp b/gdb/testsuite/lib/gdb-utils.exp
index 26bbbf5..a656788 100644
--- a/gdb/testsuite/lib/gdb-utils.exp
+++ b/gdb/testsuite/lib/gdb-utils.exp
@@ -37,3 +37,21 @@ proc string_to_regexp {str} {
     regsub -all {[]*+.|(){}^$\[\\]} $str {\\&} result
     return $result
 }
+
+# Wrap STR in an ANSI terminal escape sequences -- one to set the
+# style to STYLE, and one to reset the style to the default.  The
+# return value is suitable for use as a regular expression.
+
+# STYLE can either be the payload part of an ANSI terminal sequence,
+# or a shorthand for one of the gdb standard styles: "file",
+# "function", "variable", or "address".
+
+proc style {str style} {
+    switch -exact -- $style {
+	file { set style 32 }
+	function { set style 33 }
+	variable { set style 36 }
+	address { set style 34 }
+    }
+    return "\033\\\[${style}m${str}\033\\\[m"
+}
-- 
cgit v1.1