* gdb.base/signals.exp: Change setup_xfail for "alpha-*-osf2"

	to "alpha-*-osf2*" and add comment.
	* gdb.base/a1-selftest.exp (test_with_self): Remove "alpha-dec-osf2*"
 	setup_xfail for "step over execarg initialization" and
 	"step over corearg initialization".
	* gdb.base/callfuncs.exp (do_function_calls): Restore setup_xfail
	for "hppa*-*-*", "sparc-*-*", "mips*-*-*", and "alpha-dec-osf2*".
	* gdb.base/corefile.exp: Add "alpha-dec-osf2*" setup_xfail when not
 	gcc compiled for "print coremaker_bss", "print coremaker_ro",
	"print func2::coremaker_local", and "backtrace in corefile.exp".
	* gdb.base/signals.exp: Build and source signals.ci.
	(test_handle_all_print): Add setup_xfail for "alpha-dec-osf2*".
	Change "alpha-dec-osf2*" setup_xfail for "bt in signals.exp"
	to be for gcc only.
	* lib/gdb.exp: Move verbose statements outside conditionals.

3 files changed, 32 insertions, 6 deletions

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index ef56d26..86d4f9e 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,21 @@
+Sun Feb 18 11:39:12 1996  Fred Fish  <fnf@cygnus.com>
+
+	* gdb.base/signals.exp: Change setup_xfail for "alpha-*-osf2"
+	to "alpha-*-osf2*" and add comment.
+	* gdb.base/a1-selftest.exp (test_with_self): Remove "alpha-dec-osf2*"
+ 	setup_xfail for "step over execarg initialization" and
+ 	"step over corearg initialization".
+	* gdb.base/callfuncs.exp (do_function_calls): Restore setup_xfail
+	for "hppa*-*-*", "sparc-*-*", "mips*-*-*", and "alpha-dec-osf2*".
+	* gdb.base/corefile.exp: Add "alpha-dec-osf2*" setup_xfail when not
+ 	gcc compiled for "print coremaker_bss", "print coremaker_ro",
+	"print func2::coremaker_local", and "backtrace in corefile.exp".
+	* gdb.base/signals.exp: Build and source signals.ci.
+	(test_handle_all_print): Add setup_xfail for "alpha-dec-osf2*".
+	Change "alpha-dec-osf2*" setup_xfail for "bt in signals.exp"
+	to be for gcc only.
+	* lib/gdb.exp: Move verbose statements outside conditionals.
+	
 Tue Feb 20 16:36:10 1996  Fred Fish  <fnf@cygnus.com>
 
 	* gdb.c++/misc.cc: Add test code from Mike Stump.
diff --git a/gdb/testsuite/gdb.base/a1-selftest.exp b/gdb/testsuite/gdb.base/a1-selftest.exp
index ec6fff2..e431924 100644
--- a/gdb/testsuite/gdb.base/a1-selftest.exp
+++ b/gdb/testsuite/gdb.base/a1-selftest.exp
@@ -154,7 +154,6 @@ proc test_with_self {} {
 	}
     }
 
-    setup_xfail "alpha-dec-osf2*"
     set description "step over execarg initialization"
     send "step\n"
     expect {
@@ -175,7 +174,6 @@ proc test_with_self {} {
 	}
     }
 
-    setup_xfail "alpha-dec-osf2*"
     set description "step over corearg initialization"
     send "step\n"
     expect {
diff --git a/gdb/testsuite/gdb.base/signals.exp b/gdb/testsuite/gdb.base/signals.exp
index b4f8c46..4f9861d 100644
--- a/gdb/testsuite/gdb.base/signals.exp
+++ b/gdb/testsuite/gdb.base/signals.exp
@@ -11,13 +11,20 @@ set prms_id 0
 set bug_id 0
 
 set testfile signals
-set srcfile ${srcdir}/$subdir/${testfile}.c
+set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
-if  { [compile "${srcfile} -g -o ${binfile}"] != "" } {
+if  { [compile "${srcdir}/${subdir}/${srcfile} -g -o ${binfile}"] != "" } {
     perror "Couldn't compile ${srcfile}"
     return -1
 }
 
+execute_anywhere "rm -f ${binfile}.ci"
+if  { [compile "-E ${srcdir}/${subdir}/compiler.c > ${binfile}.ci"] != "" } {
+    perror "Couldn't make ${testfile}.ci file"
+    return -1
+}
+source gdb.base/${testfile}.ci
+
 proc signal_tests_1 {} {
     global prompt
     if [runto_main] then {
@@ -231,7 +238,7 @@ proc signal_tests_1 {} {
 	# to tell gdb about `pass' signals).  So the fix would appear to
 	# be to just yank that one breakpoint when we step over it.
 
-	setup_xfail "sparc-*-*"
+	setup_xfail "sparc*-*-*"
 	setup_xfail "rs6000-*-*"
 	setup_xfail "powerpc-*-*"
 
@@ -297,6 +304,7 @@ proc test_handle_all_print {} {
     # Allow blank or TAB as whitespace characters.
     set timeout 30
     match_max 8000
+    setup_xfail "alpha-dec-osf2*"
     gdb_test "handle all print" "Signal\[ 	\]+Stop\[ 	\]+Print\[ 	\]+Pass to program\[ 	\]+Description\r\nSIGHUP\[ 	\]+Yes\[ 	\]+Yes\[ 	\]+Yes\[ 	\]+Hangup.*SIG63\[ 	\]+Yes\[ 	\]+Yes\[ 	\]+Yes\[ 	\]+Real-time event 63"
 }
 test_handle_all_print
@@ -357,7 +365,9 @@ if [runto_main] then {
 The program being debugged stopped while in a function called from GDB.*" \
 	"p func1 () #2 in signals.exp"
     # But we should be able to backtrace...
-    setup_xfail "alpha-*-osf2"
+    # On alpha-*-osf2.0 this test works when run manually but fails when
+    # run under dejagnu, making it very hard to debug the problem.  Weird...
+    if {$gcc_compiled} then { setup_xfail "alpha-*-osf2*" }
     gdb_test "bt" "#0.*handler.*#1.*#2.*main.*" "bt in signals.exp"
     # ...and continue...
     gdb_test "continue" "Continuing\\." "continue in signals.exp"