[PATCH 3/3] [gdb/testsuite] Don't generate dummy CUs in dwz files

[Tom de Vries <tdevries@suse.de>]

I came across .debug_aranges sections in .dwz files.  Fix this by skipping
dummy CU generation in .dwz files.

Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=34157
---
 gdb/testsuite/gdb.dwarf2/dwzbuildid.tcl        | 2 +-
 gdb/testsuite/gdb.dwarf2/struct-with-sig-2.exp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gdb/testsuite/gdb.dwarf2/dwzbuildid.tcl b/gdb/testsuite/gdb.dwarf2/dwzbuildid.tcl
index 45a80bd7ce4..84e0c9f7669 100644
--- a/gdb/testsuite/gdb.dwarf2/dwzbuildid.tcl
+++ b/gdb/testsuite/gdb.dwarf2/dwzbuildid.tcl
@@ -65,7 +65,7 @@ proc write_just_debugaltlink {filename dwzname buildid} {
 proc write_dwarf_file {filename buildid {value 99}} {
     set asm_file [standard_output_file $filename]
 
-    Dwarf::assemble $asm_file {
+    Dwarf::assemble [list filename $asm_file add_dummy_cus 0] {
 	declare_labels int_label int_label2
 
 	upvar buildid buildid
diff --git a/gdb/testsuite/gdb.dwarf2/struct-with-sig-2.exp b/gdb/testsuite/gdb.dwarf2/struct-with-sig-2.exp
index 28a2fd7ad58..5c9f27149af 100644
--- a/gdb/testsuite/gdb.dwarf2/struct-with-sig-2.exp
+++ b/gdb/testsuite/gdb.dwarf2/struct-with-sig-2.exp
@@ -26,7 +26,7 @@ set build_id [string repeat ff 20]
 
 # Make some DWARF for the dwz file.
 set asm_file [standard_output_file $srcfile2]
-Dwarf::assemble $asm_file {
+Dwarf::assemble [list filename $asm_file add_dummy_cus 0] {
     build_id $::build_id
 
     tu {} 0x0000000000000001 the_type_i {
-- 
2.51.0