From ddb01977fb3453da381fad056ec7e19b5017c072 Mon Sep 17 00:00:00 2001
From: Jeff Law <law@redhat.com>
Date: Sat, 5 Feb 1994 18:20:02 +0000
Subject: [PATCH]         * gdb.disasm/hppa.exp (fmpy_addsub_tests): Fix typo
 in expect string.         No longer expected to fail.

---
 gdb/testsuite/ChangeLog           |  5 +++++
 gdb/testsuite/gdb.disasm/hppa.exp | 11 ++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index b104ecdf6f..9a7ee16174 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+Sat Feb  5 10:19:09 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
+
+	* gdb.disasm/hppa.exp (fmpy_addsub_tests): Fix typo in expect
+	string.  No longer expected to fail.
+
 Fri Feb  4 23:45:11 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
 
 	* gdb.disasm/hppa.exp (fcmp_tests): Fix thinko in expect string.
diff --git a/gdb/testsuite/gdb.disasm/hppa.exp b/gdb/testsuite/gdb.disasm/hppa.exp
index b3446e5865..dcacaad2a2 100644
--- a/gdb/testsuite/gdb.disasm/hppa.exp
+++ b/gdb/testsuite/gdb.disasm/hppa.exp
@@ -995,15 +995,13 @@ proc all_fpu_computational_tests { } {
 	}
     }
 
-    # Spacing problems, wrong format, wrong registers.  Just plain wrong. 
-    setup_xfail hppa*-*-*
     send "x/4i fmpy_addsub_tests\n"
     expect {
 	-re ".*
-.*fmpyadd,sgl fr16,fr17,fr18,fr19,fr20
-.*fmpyadd,dbl fr16,fr17,fr18,fr19,fr20
-.*fmpysub,sgl fr16,fr17,fr18,fr19,fr20
-.*fmpysub,dbl fr16,fr17,fr18,fr19,fr20
+.*fmpyadd,sgl fr16,fr17,fr18,fr19,fr20\r\n\
+.*fmpyadd,dbl fr16,fr17,fr18,fr19,fr20\r\n\
+.*fmpysub,sgl fr16,fr17,fr18,fr19,fr20\r\n\
+.*fmpysub,dbl fr16,fr17,fr18,fr19,fr20\r\n\
 .*$prompt $" { pass "fmpy_addsub_tests" }
 	-re "$prompt $" { fail "fmpy_addsub_tests" }
 	timeout { fail "(timeout) fmpy_addsub_tests" }
@@ -1027,7 +1025,6 @@ proc all_fpu_comparison_tests { } {
 
     set fpu_comparison_formats [list {sgl} {dbl} {quad} ]
 
-    # Fails due to spacing and probably formatting problems.
     foreach i $fpu_comparison_formats {
 	send "x/32i fcmp_$i"; send "_tests\n"
 	expect {