From e691325a9c31d84e1980c30cedaac4a3b15a7a84 Mon Sep 17 00:00:00 2001
From: Pierre Muller <muller@sourceware.org>
Date: Thu, 28 Feb 2008 10:32:50 +0000
Subject: [PATCH] 2008-02-28  Pierre Muller  <muller@ics.u-strasbg.fr>

	* gdb.base/assign.exp: avoid same output for different tests.
---
 gdb/testsuite/ChangeLog           |  4 ++++
 gdb/testsuite/gdb.base/assign.exp | 34 +++++++++++++++----------------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index b2ff584b82..b1bc0766e6 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-28  Pierre Muller  <muller@ics.u-strasbg.fr>
+
+	* gdb.base/assign.exp: avoid same output for different tests. 
+
 2008-02-27  Doug Evans  <dje@google.com>
 
 	* gdb.base/sigstep.exp (breakpoint_to_handler): Remove setup_kfail
diff --git a/gdb/testsuite/gdb.base/assign.exp b/gdb/testsuite/gdb.base/assign.exp
index f94506bc6b..a6f84830f0 100644
--- a/gdb/testsuite/gdb.base/assign.exp
+++ b/gdb/testsuite/gdb.base/assign.exp
@@ -98,7 +98,7 @@ gdb_expect {
     timeout           { fail "(timeout) v_int+=57" }    
   }
 
-gdb_test "set variable v_int = 6" "" "set v_int to 6"
+gdb_test "set variable v_int = 6" "" "set v_int to 6 (2)"
 
 send_gdb "print v_int-=57\n"
 gdb_expect {
@@ -116,7 +116,7 @@ gdb_expect {
     timeout           { fail "(timeout) v_int-=57" }    
   }
 
-gdb_test "set variable v_int = 6" "" "set v_int to 6"
+gdb_test "set variable v_int = 6" "" "set v_int to 6 (3)"
 
 send_gdb "print v_int*=5\n"
 gdb_expect {
@@ -134,7 +134,7 @@ gdb_expect {
     timeout           { fail "(timeout) v_int*=5" }    
   }
 
-gdb_test "set variable v_int = 6" "" "set v_int to 6"
+gdb_test "set variable v_int = 6" "" "set v_int to 6 (4)"
 
 send_gdb "print v_int/=4\n"
 gdb_expect {
@@ -154,7 +154,7 @@ gdb_expect {
 
 
 
-gdb_test "set variable v_int = 6" "" "set v_int to 6"
+gdb_test "set variable v_int = 6" "" "set v_int to 6 (5)"
 
 send_gdb "print v_int%=4\n"
 gdb_expect {
@@ -174,7 +174,7 @@ gdb_expect {
 
 
 
-gdb_test "set variable v_int = 6" "" "set v_int to 6"
+gdb_test "set variable v_int = 6" "" "set v_int to 6 (6)"
 
 
 
@@ -195,7 +195,7 @@ gdb_expect {
   }
 
 
-gdb_test "set variable v_int = 6" "" "set v_int to 6"
+gdb_test "set variable v_int = 6" "" "set v_int to 6 (7)"
 
 
 
@@ -216,7 +216,7 @@ gdb_expect {
   }
 
 
-gdb_test "set variable v_int = 6" "" "set v_int to 6"
+gdb_test "set variable v_int = 6" "" "set v_int to 6 (8)"
 
 
 
@@ -237,7 +237,7 @@ gdb_expect {
   }
 
 
-gdb_test "set variable v_int = 6" "" "set v_int to 6"
+gdb_test "set variable v_int = 6" "" "set v_int to 6 (9)"
 
 
 
@@ -258,7 +258,7 @@ gdb_expect {
   }
 
 
-gdb_test "set variable v_int = 6" "" "set v_int to 6"
+gdb_test "set variable v_int = 6" "" "set v_int to 6 (10)"
 
 
 
@@ -279,7 +279,7 @@ gdb_expect {
   }
 
 
-gdb_test "set variable v_int = 6" "" "set v_int to 6"
+gdb_test "set variable v_int = 6" "" "set v_int to 6 (11)"
 
 
 
@@ -300,7 +300,7 @@ gdb_expect {
   }
 
 
-gdb_test "set variable v_int = 6" "" "set v_int to 6"
+gdb_test "set variable v_int = 6" "" "set v_int to 6 (12)"
 
 
 
@@ -321,7 +321,7 @@ gdb_expect {
   }
 
 
-gdb_test "set variable v_int = 6" "" "set v_int to 6"
+gdb_test "set variable v_int = 6" "" "set v_int to 6 (13)"
 
 
 
@@ -342,7 +342,7 @@ gdb_expect {
   }
 
 
-gdb_test "set variable v_int = 6" "" "set v_int to 6"
+gdb_test "set variable v_int = 6" "" "set v_int to 6 (14)"
 
 
 
@@ -363,7 +363,7 @@ gdb_expect {
   }
 
 
-gdb_test "set variable v_int = 6" "" "set v_int to 6"
+gdb_test "set variable v_int = 6" "" "set v_int to 6 (15)"
 
 
 
@@ -384,7 +384,7 @@ gdb_expect {
   }
 
 
-gdb_test "set variable v_int = 6" "" "set v_int to 6"
+gdb_test "set variable v_int = 6" "" "set v_int to 6 (16)"
 
 
 send_gdb "print v_int+=v_unsigned_long\n"
@@ -404,7 +404,7 @@ gdb_expect {
   }
 
 
-gdb_test "set variable v_int = 6" "" "set v_int to 6"
+gdb_test "set variable v_int = 6" "" "set v_int to 6 (17)"
 
 
 send_gdb "print v_int+=v_float\n"
@@ -424,7 +424,7 @@ gdb_expect {
   }
 
 
-gdb_test "set variable v_int = 6" "" "set v_int to 6"
+gdb_test "set variable v_int = 6" "" "set v_int to 6 (18)"
 
 
 send_gdb "print v_int+=v_double\n"