From 47a39c6e18324360b3ef9b72f03e206417f2ce9c Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@adacore.com>
Date: Mon, 28 Feb 2022 13:42:03 -0700
Subject: [PATCH] Fix gdb.ada/arrayptr.exp results

PR ada/28115 points out that gdb.ada/arrayptr.exp works with GNAT 12,
but fails with minimal encodings in earlier versions.

This patch updates the test to try to report the results correctly.  I
tried this with the Fedora 34 system gcc (GCC 11) and with a GCC 12
built from git trunk sometime relatively recently.

Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=28115
---
 gdb/testsuite/gdb.ada/arrayptr.exp | 37 +++++++++++-------------------
 1 file changed, 13 insertions(+), 24 deletions(-)

diff --git a/gdb/testsuite/gdb.ada/arrayptr.exp b/gdb/testsuite/gdb.ada/arrayptr.exp
index 0e188bf9943..23e89759666 100644
--- a/gdb/testsuite/gdb.ada/arrayptr.exp
+++ b/gdb/testsuite/gdb.ada/arrayptr.exp
@@ -54,33 +54,22 @@ foreach_with_prefix scenario {all minimal} {
     set kfail_packed_array_range_re \
 	"cannot subscript or call something of type `foo__packed_array_ptr'"
 
-    gdb_test_multiple "print pa_ptr.all" "" {
-	-re -wrap " = \\(10, 20, 30, 40, 50, 60, 62, 63, -23, 42\\)" {
-	    pass $gdb_test_name
-	}
-	-re -wrap $kfail_int128support_re {
-	    kfail gdb/20991 $gdb_test_name
-	}
+    # GNAT >= 12.0 has the needed fix here.
+    if {$scenario == "minimal" && ![test_compiler_info {gcc-1[2-9]-*}]} {
+	setup_kfail "minimal encodings" *-*-*
     }
+    gdb_test "print pa_ptr.all" \
+	" = \\(10, 20, 30, 40, 50, 60, 62, 63, -23, 42\\)"
 
-    gdb_test_multiple "print pa_ptr(3)" "" {
-	-re -wrap " = 30" {
-	    pass $gdb_test_name
-	}
-	-re -wrap $kfail_int128support_re {
-	    kfail gdb/20991 $gdb_test_name
-	}
-	-re -wrap $kfail_packed_array_range_re {
-	    kfail gdb/28115 $gdb_test_name
-	}
+    # GNAT >= 12.0 has the needed fix here.
+    if {$scenario == "minimal" && ![test_compiler_info {gcc-1[2-9]-*}]} {
+	setup_kfail "minimal encodings" *-*-*
     }
+    gdb_test "print pa_ptr(3)" " = 30"
 
-    gdb_test_multiple "print pa_ptr.all(3)" "" {
-	-re -wrap " = 30" {
-	    pass $gdb_test_name
-	}
-	-re -wrap $kfail_int128support_re {
-	    kfail gdb/20991 $gdb_test_name
-	}
+    # GNAT >= 12.0 has the needed fix here.
+    if {$scenario == "minimal" && ![test_compiler_info {gcc-1[2-9]-*}]} {
+	setup_kfail "minimal encodings" *-*-*
     }
+    gdb_test "print pa_ptr.all(3)" " = 30"
 }
-- 
2.30.2