* gdb.base/macscp.exp (objfile): Move it to ${objdir}/${subdir}/.

	(list_and_check_macro): Use more specific test name.
	(next to definition): Make the test names unique.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 939d75cf30b0db04744fdfb9c2bb16a64e841730..e3aaeab4f8b53bcc0cd84596e26522baaec676f5 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-18  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+       * gdb.base/macscp.exp (objfile): Move it to ${objdir}/${subdir}/.
+       (list_and_check_macro): Use more specific test name.
+       (next to definition): Make the test names unique.
+
 2009-02-18  Pierre Muller  <muller@ics.u-strasbg.fr>
 
        * gdb.pascal/floats.exp: Accept approximate results everywhere.

diff --git a/gdb/testsuite/gdb.base/macscp.exp b/gdb/testsuite/gdb.base/macscp.exp
index f0250ad6e9e1c2162eb9edf95e4b1380c9045c20..7086e90fce2d4a3151c6eaa34372fc9655ed5b97 100644 (file)
--- a/gdb/testsuite/gdb.base/macscp.exp
+++ b/gdb/testsuite/gdb.base/macscp.exp
@@ -23,7 +23,7 @@ set bug_id 0
 
 set srcfile macscp1.c
 set testfile "macscp"
-set objfile "macscp.o"
+set objfile ${objdir}/${subdir}/${testfile}.o
 set binfile ${objdir}/${subdir}/${testfile}
 
 set options { debug }
@@ -188,12 +188,12 @@ proc check_macro {macro expected where} {
     }
     return 0
 }
-    
+
 
 # List the function FUNC, and then show the definition of MACRO,
 # expecting the result EXPECTED.
 proc list_and_check_macro {func macro expected} {
-    gdb_test "list $func" ".*${func}.*"
+    gdb_test "list $func" ".*${func}.*" "list $func for $macro"
     return [check_macro $macro $expected "after `list $func'"]
 }
 
@@ -423,7 +423,7 @@ gdb_test "print MACRO_TO_EXPAND" \
     "No symbol \"MACRO_TO_EXPAND\" in current context\." \
     "print expression with macro before define."
 
-gdb_test "next" "foo = 1;" "next to definition"
+gdb_test "next" "foo = 1;" "next to definition 1"
 
 gdb_test "print MACRO_TO_EXPAND" \
     " = 0" \
@@ -445,7 +445,7 @@ gdb_test "print MACRO_TO_EXPAND" \
     " = 0" \
     "print expression with macro after removing override"
 
-gdb_test "next" "foo = 2;" "next to definition"
+gdb_test "next" "foo = 2;" "next to definition 2"
 
 gdb_test "print MACRO_TO_EXPAND" \
     "No symbol \"MACRO_TO_EXPAND\" in current context\." \