aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
authorTom Tromey <tromey@redhat.com>2008-09-30 16:53:06 +0000
committerTom Tromey <tromey@redhat.com>2008-09-30 16:53:06 +0000
commit506800a969be975219e8f7c82efa68589d56b259 (patch)
tree2fb69a4d2f20d518ab08764961f27d4019774bad /gdb
parentb796d39d3a974d7d0946366467c5bdf72460d4e5 (diff)
downloadgdb-506800a969be975219e8f7c82efa68589d56b259.zip
gdb-506800a969be975219e8f7c82efa68589d56b259.tar.gz
gdb-506800a969be975219e8f7c82efa68589d56b259.tar.bz2
* gdb.base/macscp.exp: Change "M" to "MACRO_TO_EXPAND"
everywhere. * gdb.base/macscp1.c (MACRO_TO_EXPAND): Rename from "M".
Diffstat (limited to 'gdb')
-rw-r--r--gdb/testsuite/ChangeLog6
-rw-r--r--gdb/testsuite/gdb.base/macscp.exp34
-rw-r--r--gdb/testsuite/gdb.base/macscp1.c4
3 files changed, 25 insertions, 19 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 32210f2..60adacf 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2008-09-30 Tom Tromey <tromey@redhat.com>
+
+ * gdb.base/macscp.exp: Change "M" to "MACRO_TO_EXPAND"
+ everywhere.
+ * gdb.base/macscp1.c (MACRO_TO_EXPAND): Rename from "M".
+
2008-09-28 Jan Kratochvil <jan.kratochvil@redhat.com>
* gdb.threads/attachstop-mt.exp: Note a real testcase name this
diff --git a/gdb/testsuite/gdb.base/macscp.exp b/gdb/testsuite/gdb.base/macscp.exp
index d9fd97c..152e006 100644
--- a/gdb/testsuite/gdb.base/macscp.exp
+++ b/gdb/testsuite/gdb.base/macscp.exp
@@ -410,64 +410,64 @@ gdb_test "break [gdb_get_line_number "set breakpoint here"]" \
gdb_test "continue" "foo = 0;.*" "continue to macsp_expr"
-gdb_test "print M" \
- "No symbol \"M\" in current context\." \
+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 "print M" \
+gdb_test "print MACRO_TO_EXPAND" \
" = 0" \
"print expression with macro in scope."
-gdb_test "macro define M 72" \
+gdb_test "macro define MACRO_TO_EXPAND 72" \
"" \
"user macro override"
-gdb_test "print M" \
+gdb_test "print MACRO_TO_EXPAND" \
" = 72" \
"choose user macro"
-gdb_test "macro undef M" \
+gdb_test "macro undef MACRO_TO_EXPAND" \
"" \
"remove user override"
-gdb_test "print M" \
+gdb_test "print MACRO_TO_EXPAND" \
" = 0" \
"print expression with macro after removing override"
gdb_test "next" "foo = 2;" "next to definition"
-gdb_test "print M" \
- "No symbol \"M\" in current context\." \
+gdb_test "print MACRO_TO_EXPAND" \
+ "No symbol \"MACRO_TO_EXPAND\" in current context\." \
"print expression with macro after undef."
-gdb_test "macro define M 5" \
+gdb_test "macro define MACRO_TO_EXPAND 5" \
"" \
"basic macro define"
-gdb_test "print M" \
+gdb_test "print MACRO_TO_EXPAND" \
" = 5" \
"expansion of defined macro"
gdb_test "macro list" \
- "macro define M 5" \
+ "macro define MACRO_TO_EXPAND 5" \
"basic macro list"
-gdb_test "macro define M(x) x" \
+gdb_test "macro define MACRO_TO_EXPAND(x) x" \
"" \
"basic redefine, macro with args"
-gdb_test "print M (7)" \
+gdb_test "print MACRO_TO_EXPAND (7)" \
" = 7" \
"expansion of macro with arguments"
-gdb_test "macro undef M" \
+gdb_test "macro undef MACRO_TO_EXPAND" \
"" \
"basic macro undef"
-gdb_test "print M" \
- "No symbol \"M\" in current context\." \
+gdb_test "print MACRO_TO_EXPAND" \
+ "No symbol \"MACRO_TO_EXPAND\" in current context\." \
"print expression with macro after user undef."
# Regression test; this used to crash.
diff --git a/gdb/testsuite/gdb.base/macscp1.c b/gdb/testsuite/gdb.base/macscp1.c
index 200ac26..0be78c6 100644
--- a/gdb/testsuite/gdb.base/macscp1.c
+++ b/gdb/testsuite/gdb.base/macscp1.c
@@ -69,9 +69,9 @@ macscp_expr (void)
int foo = -1;
foo = 0; /* set breakpoint here */
-#define M foo
+#define MACRO_TO_EXPAND foo
foo = 1;
-#undef M
+#undef MACRO_TO_EXPAND
foo = 2;
}