2001-06-24 Michael Chastain <chastain@redhat.com>

	* gdb.base/arithmet.exp: Remove some tests to make all test names
	unique.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 086a30e..a10cd41 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2001-06-24  Michael Chastain  <chastain@redhat.com>
+
+       * gdb.base/arithmet.exp: Remove some tests to make all test names
+       unique.
+
 2001-07-03  Michael Snyder  <msnyder@redhat.com>
 
        * gdb.c++/classes.exp: Accept both "foo(void)" and "foo()" in

diff --git a/gdb/testsuite/gdb.base/arithmet.exp b/gdb/testsuite/gdb.base/arithmet.exp
index 57afc8d..6e7e685 100644 (file)
--- a/gdb/testsuite/gdb.base/arithmet.exp
+++ b/gdb/testsuite/gdb.base/arithmet.exp
@@ -94,40 +94,24 @@ gdb_test "print x%y%z"  "0"
 
 gdb_test "set variable x=10" ""
 gdb_test "set variable y=4"  ""
-gdb_test "set variable z=2"  ""
 
 #  x  y  z  w
 # 10  4  2  3
 
 gdb_test "print x+y-z" "12"
 gdb_test "print x+y*z" "18"
-
-#  x  y  z  w
-# 10  4  3  3
-
-gdb_test "set variable z=3"  ""
-gdb_test "print x+y%z" "11"
-gdb_test "print x+y/z" "11"
-
-#  x  y  z  w
-# 10  4  2  3
-
-gdb_test "set variable z=2"  ""
+gdb_test "print x+y%w" "11"
+gdb_test "print x+y/w" "11"
 gdb_test "print x-y*z"  "2"
 gdb_test "print x-y%z" "10"
 gdb_test "print x-y/z"  "8"
 gdb_test "print x*y/z" "20"
-
-#  x  y  z  w
-# 10  4  3  3
-
-gdb_test "set variable z=3"  ""
-gdb_test "print x*y%z"  "1"
-gdb_test "print x/y%z"  "2"
+gdb_test "print x*y%w"  "1"
+gdb_test "print x/y%w"  "2"
 
 # test use of parentheses to enforce different order of evaluation
 
-gdb_test "print x-(y+z)"  "3"
-gdb_test "print x/(y*z)"  "0"
-gdb_test "print x-(y/z)"  "9"
-gdb_test "print (x+y)*z" "42"
+gdb_test "print x-(y+w)"  "3"
+gdb_test "print x/(y*w)"  "0"
+gdb_test "print x-(y/w)"  "9"
+gdb_test "print (x+y)*w" "42"