* gdb.base/auxv.exp: Skip on non-linux, non-solaris targets.

	* gdb.base/cursal.exp: Use gdb_file_cmd first, then separate gdb_load.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index c4f4e8a0889be5f06f4fd2a67481cdfe1a731404..641cdd2168712ba8f5bb29e2820d2d81d2c88e7d 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-24  Nathan Sidwell  <nathan@codesourcery.com>
+
+       * gdb.base/auxv.exp: Skip on non-linux, non-solaris targets.
+       * gdb.base/cursal.exp: Use gdb_file_cmd first, then separate gdb_load.
+
 2006-07-21  Andrew Stubbs  <andrew.stubbs@st.com>
 
        * gdb.base/default.exp: Update source command error message.

diff --git a/gdb/testsuite/gdb.base/auxv.exp b/gdb/testsuite/gdb.base/auxv.exp
index dd43d85cf99c068665882f80a63b074d5718e814..ad4462b820cec1562c9019d642cbd391a8cd45d1 100644 (file)
--- a/gdb/testsuite/gdb.base/auxv.exp
+++ b/gdb/testsuite/gdb.base/auxv.exp
@@ -23,6 +23,11 @@
 # This file is based on corefile.exp which was written by Fred
 # Fish. (fnf@cygnus.com)
 
+if { ! [istarget "*-*-linux*"] && ! [istarget "*-*-solaris*"] } {
+    verbose "Skipping auxv.exp because of lack of support."
+    return
+}
+
 if $tracelevel then {
        strace $tracelevel
 }

diff --git a/gdb/testsuite/gdb.base/cursal.exp b/gdb/testsuite/gdb.base/cursal.exp
index c3ddc554349fb9d46320a90b228fde4aa1129ec1..8dbd5fa2550a7462bd3e3144c781a8fe0b5e1fcc 100644 (file)
--- a/gdb/testsuite/gdb.base/cursal.exp
+++ b/gdb/testsuite/gdb.base/cursal.exp
@@ -34,8 +34,7 @@ if {[gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug
 gdb_exit
 gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
+gdb_file_cmd ${binfile}
 gdb_test "set listsize 1" \
     ".*"
 
@@ -43,7 +42,7 @@ gdb_test "set listsize 1" \
 gdb_test "list" \
     "v0 = 0;" \
     "list before run"
-
+gdb_load
 if {! [runto_main]} {
     return -1
 }