* gas/all/gas.exp: Add setup_xfail for vax*-*-vms* for 930509a

	test.
	* gas/vax/quad.exp: Expect a nop after the movq.

3 files changed, 65 insertions, 20 deletions

diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog
index 6c9a08d..d35cac4 100644
--- a/gas/testsuite/ChangeLog
+++ b/gas/testsuite/ChangeLog
@@ -1,7 +1,24 @@
+Sat Jun 29 18:21:51 1996  Ian Lance Taylor  <ian@cygnus.com>
+
+	* gas/all/gas.exp: Add setup_xfail for vax*-*-vms* for 930509a
+	test.
+	* gas/vax/quad.exp: Expect a nop after the movq.
+
 Tue Jun 18 12:39:49 1996  Jeffrey A. Law  <law@rtl.cygnus.com>
 
 	* gas/h8300/cbranchh.s: Switch into h8300h mode.
-
+	* gas/h8300/h8300.exp (H8/300H misc tests): Fix test names.
+
+start-sanitize-h8s
+	* gas/h8300/{addsubs.s,bitops1s.s,bitops2s.s}: New tests for the
+	H8/S.
+	* gas/h8300/{bitops3.s,bitops4.s,cbranchs.s,logicals.s}: Likewise.
+	* gas/h8300/{branchess.s,compares.s,macs.s,decimals.s}: Likewise.
+	* gas/h8300/{incdecs.s,divmuls.s,miscs.s,multiples.s}: Likewise.
+	* gas/h8300/{movbs.s,movws.s,movls.s,pushpops.s}: Likewise.
+	* gas/h8300/{rotshifts.s,extends.s}: Likewise.
+	* gas/h8300/h8300.exp: Run them.
+end-sanitize-h8s
 Mon Jun 10 14:14:40 1996  Ian Lance Taylor  <ian@cygnus.com>
 
 	* gas/all/cofftag.s, gas/all/cofftag.d: New test for COFF enum tag
@@ -286,13 +303,11 @@ Mon Aug 14 16:03:07 1995  Ian Lance Taylor  <ian@cygnus.com>
 	* gasp/gasp.exp: Run them.  Also, clean up the test names used in
 	pass and fail.
 
-start-sanitize-sh3e
 Sun Aug 13 00:39:24 1995  Jeff Law  (law@snake.cs.utah.edu)
 
 	* gas/sh/basic.exp: Update now that we know the right
 	bit patters for the new sts instructions.
 
-end-sanitize-sh3e
 Thu Aug 10 00:46:21 1995  Ian Lance Taylor  <ian@cygnus.com>
 
 	* gas/mri/char.d: Fix for little endian machines.
@@ -334,12 +349,10 @@ Mon Aug  7 22:39:28 1995  Ian Lance Taylor  <ian@cygnus.com>
 	* gas/m68k/all.exp: Run new tests.  Run schwab test for
 	m68k-*-coff*.
 
-start-sanitize-sh3e
 Mon Aug  7 03:01:32 1995  Jeff Law  (law@snake.cs.utah.edu)
 
 	* gas/sh/*: New tests for the hitachi-sh.
 
-end-sanitize-sh3e
 Tue Aug  1 18:02:47 1995  Ian Lance Taylor  <ian@cygnus.com>
 
 	* gas/mri/*: New tests for MRI mode.
diff --git a/gas/testsuite/gas/all/gas.exp b/gas/testsuite/gas/all/gas.exp
index 5247125..45b5c1f 100644
--- a/gas/testsuite/gas/all/gas.exp
+++ b/gas/testsuite/gas/all/gas.exp
@@ -14,18 +14,19 @@ gas_test "p2425.s" ""   "" "pcrel values in assignment"
 if [istarget hppa*-*-*] then {
     setup_xfail *-*-*
     fail "simplifiable double subtraction"
-    setup_xfail *-*-*
-    fail "simplifiable double subtraction, with listings"
 } else {
-    setup_xfail *-*-*
-    gas_test "p1480.s" ""   "" "simplifiable double subtraction"
-    setup_xfail *-*-*
-    gas_test "p1480.s" "-a" "" "simplifiable double subtraction, with listings"
+    gas_test "p1480.s" "" "-a>" "simplifiable double subtraction"
 }
 
 gas_test "float.s" ""   "" "simple FP constants"
 
-gas_test_error "diff1.s" "" "difference of two undefined symbols"
+# This test is meaningless for the PA; the difference of two undefined
+# symbols is something that is (and must be) supported on the PA.
+if ![istarget hppa*-*-*] then {
+    # the h8300 fails because we skip all the logic in fixup_segment
+    setup_xfail "h8300*-*-*"
+    gas_test_error "diff1.s" "" "difference of two undefined symbols"
+}
 
 proc do_comment {} {
     set testname "comment.s: comments in listings"
@@ -40,9 +41,9 @@ proc do_comment {} {
 	expect {
 	    -re "^ +1\[ \t\]+# This\[^\n\]*\n"		{ set x1 1 }
 	    -re "^ +2\[ \t\]+# correctly\[^\n\]*\n"	{ set x2 1 }
-	    -re "^ +3\[ \t\]+/. C comments too. ./\r\n" { set x3 1 }
+	    -re "^ +3\[ \t\]+/. C comments too. ./\r?\n" { set x3 1 }
 	    -re "\[^\n\]*\n"				{ }
-	    timeout				{ error "timeout\n"; break }
+	    timeout				{ perror "timeout\n"; break }
 	    eof					{ break }
 	}
     }
@@ -66,11 +67,11 @@ proc do_930509a {} {
 # If ".long" means an 8-byte value on some target someday, this test will have
 # to be fixed.
 	expect {
-	    -re "^ +1 .... 00000000" { fail $testname; set x 1 }
-	    -re "^ +1 .... 04000000" { pass $testname; set x 1 }
-	    -re "^ +1 .... 00000004" { pass $testname; set x 1 }
+	    -re "^ +1 .... 0000 *0000" { fail $testname; set x 1 }
+	    -re "^ +1 .... 0400 *0000" { pass $testname; set x 1 }
+	    -re "^ +1 .... 0000 *0004" { pass $testname; set x 1 }
 	    -re "\[^\n\]*\n" { }
-	    timeout { error "timeout\n"; break }
+	    timeout { perror "timeout\n"; break }
 	    eof { break }
 	}
     }
@@ -78,7 +79,38 @@ proc do_930509a {} {
     if !$x then { fail $testname }
 }
 
-do_930509a
+# This test is meaningless for the PA; the difference of two symbols
+# must not be resolved by the assembler.
+if ![istarget hppa*-*-*] then {
+    # the h8300 fails because we skip all the logic in fixup_segment
+    setup_xfail "h8300*-*-*"
+    # the vax fails because VMS can apparently actually handle this
+    # case in relocs, so gas doesn't handle it itself.
+    setup_xfail "vax*-*-vms*"
+    do_930509a
+}
+
+if ![istarget hppa*-*-*] then {
+    run_dump_test struct
+}
+
+# This test is for any COFF target.
+if { [istarget *-*-coff*] \
+     || [istarget *-*-pe*] \
+     || [istarget a29k-*-udi*] \
+     || [istarget a29k-*-ebmon*] \
+     || [istarget a29k-*-sym*] \
+     || [istarget a29k-*-vxworks*] \
+     || [istarget i*86-*-aix*] \
+     || [istarget i*86-*-sco*] \
+     || [istarget i*86-*-isc*] \
+     || [istarget i*86-*-go32*] \
+     || [istarget i*86-*-cygwin*] \
+     || [istarget i*86-*-*nt] \
+     || ([istarget i960-*-vxworks5.*] && ![istarget i960-*-vxworks5.0*]) } {
+    run_dump_test cofftag
+}
+
 # FIXME: this is here cause of a bug in DejaGnu 1.1.1. When it is no longer
 #        in use, then this can be removed.
 if [info exists errorInfo] then {
diff --git a/gas/testsuite/gas/vax/quad.exp b/gas/testsuite/gas/vax/quad.exp
index 46fc9ca..34770c5 100644
--- a/gas/testsuite/gas/vax/quad.exp
+++ b/gas/testsuite/gas/vax/quad.exp
@@ -8,7 +8,7 @@ proc do_quad {} {
 	expect {
 	    -re "^ +2\[ \t\]+0000+ 7D8F7856\[ \t\]+movq\[^\n\]*\n" { set x1 1 }
 	    -re "^ +2\[ \t\]+3412DDCC\[^\n\]*\n"		   { set x2 1 }
-	    -re "^ +2\[ \t\]+BBAA50\[ \t\]*\r\n"		   { set x3 1 }
+	    -re "^ +2\[ \t\]+BBAA5001\[ \t\]*\r\n"		   { set x3 1 }
 	    -re "\[^\n\]*\n"				{ }
 	    timeout				{ perror "timeout\n"; break }
 	    eof					{ break }