[binutils-gdb] [gdb/testsuite] Fix xpass in gdb.python/lib-types.exp

[binutils-gdb] [gdb/testsuite] Fix xpass in gdb.python/lib-types.exp

[Tom de Vries]

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

commit c9c41e6d73af4593b02471ca4d40ea00e453465a
Author: Tom de Vries <tdevries@suse.de>
Date:   Wed Feb 19 22:57:19 2020 +0100

    [gdb/testsuite] Fix xpass in gdb.python/lib-types.exp
    
    When running gdb.python/lib-types.exp, we have an xpass:
    ...
    (gdb) python print (str (typedef_const_typedef_class1_ref_obj.type))^M
    typedef_const_typedef_class1_ref^M
    (gdb) XPASS: gdb.python/lib-types.exp: \
      python print (str (typedef_const_typedef_class1_ref_obj.type)) \
      (PRMS gcc/55641)
    ...
    
    When running the same with gcc 4.8, we have an xfail instead:
    ...
    (gdb) python print (str (typedef_const_typedef_class1_ref_obj.type))^M
    const typedef_const_typedef_class1_ref^M
    (gdb) XFAIL: gdb.python/lib-types.exp: \
      python print (str (typedef_const_typedef_class1_ref_obj.type)) \
      (PRMS gcc/55641)
    ...
    
    Fix the xpass by xfailing only for the gcc 4.8 pattern.
    
    Tested on x86_64-linux, with:
    - gcc 7.5.0
    - gcc 4.8.5
    - clang 5.0.2
    
    gdb/testsuite/ChangeLog:
    
    2020-02-19  Tom de Vries  <tdevries@suse.de>
    
    	* gdb.python/lib-types.exp: Make xfail more strict.

Diff:
---
 gdb/testsuite/ChangeLog                |  4 ++++
 gdb/testsuite/gdb.python/lib-types.exp | 11 +++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index bfa1afc..f0549c26 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,9 @@
 2020-02-19  Tom de Vries  <tdevries@suse.de>
 
+	* gdb.python/lib-types.exp: Make xfail more strict.
+
+2020-02-19  Tom de Vries  <tdevries@suse.de>
+
 	* gdb.ada/funcall_ref.exp: Replace xfail setup by unsupported check.
 
 2020-02-19  Doug Evans  <dje@google.com>
diff --git a/gdb/testsuite/gdb.python/lib-types.exp b/gdb/testsuite/gdb.python/lib-types.exp
index ab1d9d8..d2d5f9b 100644
--- a/gdb/testsuite/gdb.python/lib-types.exp
+++ b/gdb/testsuite/gdb.python/lib-types.exp
@@ -103,8 +103,15 @@ gdb_test_multiple "python print (str (basic_type_typedef_const_typedef_class1_ob
 # test nested typedef/reference stripping
 gdb_test_no_output "python typedef_const_typedef_class1_ref_obj = gdb.parse_and_eval ('typedef_const_typedef_class1_ref_obj')"
 gdb_test_no_output "python basic_type_typedef_const_typedef_class1_ref_obj = gdb.types.get_basic_type (typedef_const_typedef_class1_ref_obj.type)"
-if {[test_compiler_info {gcc-*-*}]} { setup_xfail gcc/55641 *-*-* }
-gdb_test "python print (str (typedef_const_typedef_class1_ref_obj.type))" "\[\r\n\]+typedef_const_typedef_class1_ref"
+gdb_test_multiple "python print (str (typedef_const_typedef_class1_ref_obj.type))" "" {
+    -re -wrap "\[\r\n\]+const typedef_const_typedef_class1_ref" {
+	# Compiler with PR gcc/55641.
+	xfail $gdb_test_name
+    }
+    -re -wrap "\[\r\n\]+typedef_const_typedef_class1_ref" {
+	pass $gdb_test_name
+    }
+}
 set test "nested typedef/ref stripping"
 gdb_test_multiple "python print (str (basic_type_typedef_const_typedef_class1_ref_obj))" $test {
     -re "\[\r\n\]+class1\[\r\n\]+$gdb_prompt $" {