aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kratochvil <jan.kratochvil@redhat.com>2009-02-18 22:24:37 +0000
committerJan Kratochvil <jan.kratochvil@redhat.com>2009-02-18 22:24:37 +0000
commit44aabfbc81bd7d70ae252d8c8a377a9b48d4dac7 (patch)
tree36385cd9111a4612fe8ab769895027f7d8241931
parentb1c9882d1b9f182538c9babb35fe11d152708fe0 (diff)
downloadgdb-44aabfbc81bd7d70ae252d8c8a377a9b48d4dac7.zip
gdb-44aabfbc81bd7d70ae252d8c8a377a9b48d4dac7.tar.gz
gdb-44aabfbc81bd7d70ae252d8c8a377a9b48d4dac7.tar.bz2
* 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.
-rw-r--r--gdb/testsuite/ChangeLog6
-rw-r--r--gdb/testsuite/gdb.base/macscp.exp10
2 files changed, 11 insertions, 5 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 939d75c..e3aaeab 100644
--- 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 f0250ad..7086e90 100644
--- 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\." \