* gdb.base/huge.c: Allow CRASH_GDB to be set from command

	line.
	* gdb.base/huge.exp: Loop over compilation to find a size that
	is acceptable.
	* gdb.base/remote.exp: Correct expected strings.
	* gdb.dwarf2/mac-fileno.S: Avoid # comments.

5 files changed, 29 insertions, 14 deletions

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index c609a9f..4b6deb6 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,12 @@
+2006-07-04  Nathan Sidwell  <nathan@codesourcery.com>
+
+	* gdb.base/huge.c: Allow CRASH_GDB to be set from command
+	line.
+	* gdb.base/huge.exp: Loop over compilation to find a size that
+	is acceptable.
+	* gdb.base/remote.exp: Correct expected strings.
+	* gdb.dwarf2/mac-fileno.S: Avoid # comments.
+
 2006-06-22  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* gdb.base/store.exp: Don't use gdb_suppress_entire_file.
diff --git a/gdb/testsuite/gdb.base/huge.c b/gdb/testsuite/gdb.base/huge.c
index 446bb18..27ba04e 100644
--- a/gdb/testsuite/gdb.base/huge.c
+++ b/gdb/testsuite/gdb.base/huge.c
@@ -7,9 +7,9 @@
 /* A value that will produce a target data object large enough to
    crash GDB.  0x200000 is big enough on GNU/Linux, other systems may
    need a larger number.  */
-
+#ifndef CRASH_GDB
 #define CRASH_GDB 0x200000
-
+#endif
 static int a[CRASH_GDB], b[CRASH_GDB];
 
 main()
diff --git a/gdb/testsuite/gdb.base/huge.exp b/gdb/testsuite/gdb.base/huge.exp
index 733ddee..68354ec 100644
--- a/gdb/testsuite/gdb.base/huge.exp
+++ b/gdb/testsuite/gdb.base/huge.exp
@@ -36,7 +36,13 @@ if [target_info exists gdb,skip_huge_test] {
 set testfile "huge"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
+
+for { set size [expr 2 * 1024 * 1024] } { $size > 10 } { set size [expr $size / 2] } {
+  if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
+	    executable [list debug "additional_flags=-DCRASH_GDB=$size"]] \
+      == "" } break
+}
+if { $size < 10 } {
      gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
 }
 
diff --git a/gdb/testsuite/gdb.base/remote.exp b/gdb/testsuite/gdb.base/remote.exp
index b286e3a..cf9e853 100644
--- a/gdb/testsuite/gdb.base/remote.exp
+++ b/gdb/testsuite/gdb.base/remote.exp
@@ -65,14 +65,14 @@ gdb_test "set remote memory-write-packet-size" \
 	"Argument required .integer, `fixed' or `limited'.\." \
 	"set write-packet - NULL"
 
-gdb_test "set remote memory-write-packet-size 16" ""
+gdb_test "set remote memory-write-packet-size 20" ""
 gdb_test "show remote memory-write-packet-size" \
-	"The memory-write-packet-size is 16. Packets are limited to 16 bytes." \
+	"The memory-write-packet-size is 20. Packets are limited to 20 bytes." \
 	"set write-packet - small"
 
 gdb_test "set remote memory-write-packet-size 1" ""
 gdb_test "show remote memory-write-packet-size" \
-	"The memory-write-packet-size is 1. Packets are limited to 16 bytes." \
+	"The memory-write-packet-size is 1. Packets are limited to 20 bytes." \
 	"set write-packet - very-small"
 
 #
@@ -191,7 +191,7 @@ if {$sizeof_random_data > 16380 } then {
 gdb_test "set remote memory-read-packet-size 16" \
 	""
 gdb_test "show remote memory-read-packet-size" \
-	"The memory-read-packet-size is 16. Packets are limited to 16 bytes."
+	"The memory-read-packet-size is 16. Packets are limited to 20 bytes."
 gdb_test "x/17ub random_data" \
 	"<random_data>:\[ \t\]+60\[ \t\]+74\[ \t\]+216\[ \t\]+38\[ \t\]+149\[ \t\]+49\[ \t\]+207\[ \t\]+44.*<random_data\\+8>:\[ \t\]+124\[ \t\]+38\[ \t\]+93\[ \t\]+125\[ \t\]+232\[ \t\]+67\[ \t\]+228\[ \t\]+56.*<random_data\\+16>:\[ \t\]+161"
 
diff --git a/gdb/testsuite/gdb.dwarf2/mac-fileno.S b/gdb/testsuite/gdb.dwarf2/mac-fileno.S
index 1bbb582..9be9de6 100644
--- a/gdb/testsuite/gdb.dwarf2/mac-fileno.S
+++ b/gdb/testsuite/gdb.dwarf2/mac-fileno.S
@@ -206,10 +206,10 @@ func_cu1:
 
 	.section	.debug_macinfo,"",@progbits
 .Ldebug_macinfo0:
-	.byte	0x3	# Start new file
-	.uleb128 0x0	# Included from line number 0
-	.uleb128 0x2	# Filename we just started (bug: number too large)
-	.byte	0x3	# Start new file
-	.uleb128 0x0	# Included from line number 0
-	.uleb128 0x0	# Filename we just started (bug: number too small)
-        .byte   0x0     # end of CU's macro information
+	.byte	0x3	/* Start new file */
+	.uleb128 0x0	/* Included from line number 0 */
+	.uleb128 0x2	/* Filename we just started (bug: number too large) */
+	.byte	0x3	/* Start new file */
+	.uleb128 0x0	/* Included from line number 0 */
+	.uleb128 0x0	/* Filename we just started (bug: number too small) */
+        .byte   0x0     /* end of CU's macro information */