* gdb.arch/i386-prologue.exp (skip_breakpoint): New function. Use

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.base / gcore.exp

diff --git a/gdb/testsuite/gdb.base/gcore.exp b/gdb/testsuite/gdb.base/gcore.exp
index f8d5baac61458352646edd7736b76851c074e270..29239ef87fdf8116e7474f108ec2451978f6716e 100644 (file)
--- a/gdb/testsuite/gdb.base/gcore.exp
+++ b/gdb/testsuite/gdb.base/gcore.exp
@@ -1,4 +1,4 @@
-# Copyright 2002 Free Software Foundation, Inc.
+# Copyright 2002, 2003, 2004 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -61,7 +61,7 @@ gdb_expect {
     }
 }
 
-if { ! [ runto main ] } then {
+if { ! [ runto_main ] } then {
     gdb_suppress_entire_file "Run to main failed, so all tests in this file will automatically fail."
 }
 
@@ -104,9 +104,27 @@ set pre_corefile_local_array \
 set pre_corefile_extern_array \
        [capture_command_output "print extern_array" "$print_prefix"]
 
-gdb_test "gcore ${objdir}/${subdir}/gcore.test" \
-       "Saved corefile ${objdir}/${subdir}/gcore.test" \
-       "save a corefile"
+set escapedfilename [string_to_regexp ${objdir}/${subdir}/gcore.test]
+
+gdb_test_multiple "gcore ${objdir}/${subdir}/gcore.test" \
+       "save a corefile" \
+{
+  -re "Saved corefile ${escapedfilename}\[\r\n\]+$gdb_prompt $" {
+    pass "save a corefile"
+    global core_supported
+    set core_supported 1
+  }
+  -re "Can't create a corefile\[\r\n\]+$gdb_prompt $" {
+    unsupported "save a corefile"
+    global core_supported
+    set core_supported 0
+  }
+}
+
+global core_supported
+if {!$core_supported} {
+  return -1
+}
 
 # Now restart gdb and load the corefile.
 gdb_exit
@@ -169,7 +187,6 @@ if ![string compare $pre_corefile_allregs $post_corefile_allregs] then {
 
 set post_corefile_extern_array \
        [capture_command_output "print extern_array" "$print_prefix"]
-pass "extern_array = $post_corefile_extern_array"
 if ![string compare $pre_corefile_extern_array $post_corefile_extern_array]  {
     pass "corefile restored extern array"
 } else {
@@ -178,7 +195,6 @@ if ![string compare $pre_corefile_extern_array $post_corefile_extern_array]  {
 
 set post_corefile_static_array \
        [capture_command_output "print static_array" "$print_prefix"]
-pass "static_array = $post_corefile_static_array"
 if ![string compare $pre_corefile_static_array $post_corefile_static_array]  {
     pass "corefile restored static array"
 } else {
@@ -187,7 +203,6 @@ if ![string compare $pre_corefile_static_array $post_corefile_static_array]  {
 
 set post_corefile_uninit_array \
        [capture_command_output "print un_initialized_array" "$print_prefix"]
-pass "uninit_array = $post_corefile_uninit_array"
 if ![string compare $pre_corefile_uninit_array $post_corefile_uninit_array]  {
     pass "corefile restored un-initialized array"
 } else {
@@ -196,7 +211,6 @@ if ![string compare $pre_corefile_uninit_array $post_corefile_uninit_array]  {
 
 set post_corefile_heap_string \
        [capture_command_output "print heap_string" "$print_prefix"]
-pass "heap_string = $post_corefile_heap_string"
 if ![string compare $pre_corefile_heap_string $post_corefile_heap_string]  {
     pass "corefile restored heap array"
 } else {
@@ -205,7 +219,6 @@ if ![string compare $pre_corefile_heap_string $post_corefile_heap_string]  {
 
 set post_corefile_local_array \
        [capture_command_output "print array_func::local_array" "$print_prefix"]
-pass "local_array = $post_corefile_local_array"
 if ![string compare $pre_corefile_local_array $post_corefile_local_array]  {
     pass "corefile restored stack array"
 } else {