[gdb/testsuite] Improve failure mode in gdb.dwarf2/enqueued-cu-base-addr.exp

I ran test-case gdb.dwarf2/enqueued-cu-base-addr.exp with target board
cc-with-debug-names, and ran into:
...
FAIL: gdb.dwarf2/enqueued-cu-base-addr.exp: ptype foo (GDB internal error)
FAIL: gdb.dwarf2/enqueued-cu-base-addr.exp: CU addr found
...

The first FAIL is a known issue, PR symtab/29572.

The following FAIL is a consequence of the first FAIL, so require for the
second test that the first test passes.

Tested on x86_64-linux, with target boards unix and cc-with-debug-names.

diff --git a/gdb/testsuite/gdb.dwarf2/enqueued-cu-base-addr.exp b/gdb/testsuite/gdb.dwarf2/enqueued-cu-base-addr.exp
index b60c02085b4d7297deb49d9247fdab1f34adc19e..9b2d1d87362a8dcb26a89b51626fa05ecf23d6b9 100644 (file)
--- a/gdb/testsuite/gdb.dwarf2/enqueued-cu-base-addr.exp
+++ b/gdb/testsuite/gdb.dwarf2/enqueued-cu-base-addr.exp
@@ -76,7 +76,15 @@ if { [prepare_for_testing "failed to prepare" ${testfile} \
 }
 
 # Expand cu1.  This will enqueue cu2.
-gdb_test "ptype foo" "type = int"
+set cu1_expanded 0
+gdb_test_multiple "ptype foo" "" {
+    -re -wrap "type = int" {
+       set cu1_expanded 1
+       pass $gdb_test_name
+    }
+}
+
+require {expr $cu1_expanded == 1}
 
 # Now check that cu2 has an address range starting at main.
 set cu2_blockvector_re \