From: Tom Tromey <tromey@adacore.com>
Date: Fri, 15 May 2020 16:25:56 +0000 (-0600)
Subject: Fix array_char_idx.exp
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b4757f2e45f292c9f0e48e8dbdc003e5dbfca5ed;p=binutils-gdb.git

Fix array_char_idx.exp

Newer versions of GCC can statically initialize an array in the
array_char_idx.exp test case.  This leads to a spurious failure.  This
patch fixes the problem by having the test case recognize both
possible results.

I'm checking this in.

gdb/testsuite/ChangeLog
2020-05-20  Tom Tromey  <tromey@adacore.com>

	* gdb.ada/array_char_idx.exp: Recognize initialized array.
---

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index cb038b104c4..67522a76402 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2020-05-20  Tom Tromey  <tromey@adacore.com>
+
+	* gdb.ada/array_char_idx.exp: Recognize initialized array.
+
 2020-05-20  Tom de Vries  <tdevries@suse.de>
 
 	PR symtab/25833
diff --git a/gdb/testsuite/gdb.ada/array_char_idx.exp b/gdb/testsuite/gdb.ada/array_char_idx.exp
index 6a7cbaba72a..e08dd7be9a9 100644
--- a/gdb/testsuite/gdb.ada/array_char_idx.exp
+++ b/gdb/testsuite/gdb.ada/array_char_idx.exp
@@ -31,5 +31,7 @@ gdb_test "ptype char_table" \
 gdb_test "ptype global_char_table" \
          "= array \\(character\\) of natural"
 
-gdb_test "print my_table" "= \\(0 <repeats 256 times>\\)" \
+# Some more recent versions of gcc can statically initialize this
+# array, so we allow either 0 or 4874.
+gdb_test "print my_table" "= \\((0|4874) <repeats 256 times>\\)" \
          "Display my_table"