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

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

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.

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
 }

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
 }