gdb/testsuite/

	* gdb.base/auxv.exp: Skip on non-linux, non-solaris targets.
	* gdb.base/cursal.exp: Revert my 2006-06-09 change.  Use
	gdb_file_cmd followed by gdb_load.
	* gdb.base/dbx.exp: Revert my 2006-06-09 change.

4 files changed, 15 insertions, 5 deletions

diff --git a/ChangeLog.csl b/ChangeLog.csl
index 9813b708329..08dc717a291 100644
--- a/ChangeLog.csl
+++ b/ChangeLog.csl
@@ -1,3 +1,11 @@
+2006-07-24  Nathan Sidwell  <nathan@codesourcery.com>
+
+	gdb/testsuite/
+	* gdb.base/auxv.exp: Skip on non-linux, non-solaris targets.
+	* gdb.base/cursal.exp: Revert my 2006-06-09 change.  Use
+	gdb_file_cmd followed by gdb_load.
+	* gdb.base/dbx.exp: Revert my 2006-06-09 change.
+
 2006-07-23  Kazu Hirata  <kazu@codesourcery.com>
 
 	readline/
diff --git a/gdb/testsuite/gdb.base/auxv.exp b/gdb/testsuite/gdb.base/auxv.exp
index dd43d85cf99..ad4462b820c 100644
--- 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 d35c3ac79d7..8dbd5fa2550 100644
--- a/gdb/testsuite/gdb.base/cursal.exp
+++ b/gdb/testsuite/gdb.base/cursal.exp
@@ -34,17 +34,15 @@ 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" \
     ".*"
-gdb_test "break main" ".*Breakpoint.* at .*" "set breakpoint at main"
-gdb_run_cmd
 
 # initial sal should be first statement in main
 gdb_test "list" \
     "v0 = 0;" \
     "list before run"
-
+gdb_load
 if {! [runto_main]} {
     return -1
 }
diff --git a/gdb/testsuite/gdb.base/dbx.exp b/gdb/testsuite/gdb.base/dbx.exp
index b77e58f18ad..161333c8ea3 100644
--- a/gdb/testsuite/gdb.base/dbx.exp
+++ b/gdb/testsuite/gdb.base/dbx.exp
@@ -262,7 +262,6 @@ proc gdb_file_cmd {arg} {
 #
 proc test_breakpoints { } {
     gdb_test "stop in main" "Breakpoint.*at.*: file.*average\.c, line 38\."
-    gdb_run_cmd
     gdb_test "status" "Num.*Type.*Disp.*Enb.*Address.*What\r\n1\[ \r\]+breakpoint\[ \r\]+keep y.*in main at.*average\.c:38.*"
     gdb_test "stop at 43" "Breakpoint.*at.*: file.*average\.c, line 43.*"
     gdb_test "stop in 43" "Usage: stop in <function . address>"