* gdb.base/macscp.exp: Change "M" to "MACRO_TO_EXPAND"

	everywhere.
	* gdb.base/macscp1.c (MACRO_TO_EXPAND): Rename from "M".

3 files changed, 25 insertions, 19 deletions

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 32210f2fff4..60adacf7da1 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 d9fd97ccd86..152e006d4ff 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 200ac262003..0be78c6d9c1 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;
 }