run copyright.sh for 2011.

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.base / macscp.exp

diff --git a/gdb/testsuite/gdb.base/macscp.exp b/gdb/testsuite/gdb.base/macscp.exp
index c63dde2ad8e4e427ef1e436cc29b17fdd6a4e8c8..9a56abe2c3451e4800cc44916d784c16c53acde8 100644 (file)
--- a/gdb/testsuite/gdb.base/macscp.exp
+++ b/gdb/testsuite/gdb.base/macscp.exp
@@ -1,5 +1,5 @@
 # Test macro scoping.
-# Copyright 2002, 2007, 2008, 2009 Free Software Foundation, Inc.
+# Copyright 2002, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,8 +18,6 @@ if $tracelevel then {
     strace $tracelevel
 }
 
-set prms_id 0
-set bug_id 0
 
 set srcfile macscp1.c
 set testfile "macscp"
@@ -245,7 +243,7 @@ switch -exact -- [info_macro WHERE] {
         pass "info macro WHERE after `list macscp_4_2_from_macscp2'"
     }
     {macscp4.h macscp3.h macscp1.c {before macscp4_2_..., from macscp3.h}} {
-        setup_kfail *-*-* "gdb/555"
+        setup_kfail "gdb/555" *-*-* 
         fail "info macro WHERE after `list macscp_4_2_from_macscp2' (gdb/555)"
     }
     timeout { 
@@ -260,7 +258,7 @@ switch -exact -- [info_macro WHERE] {
         pass "info macro WHERE after `list macscp_4_2_from_macscp3'"
     }
     {macscp4.h macscp2.h macscp1.c {before macscp4_2_..., from macscp2.h}} {
-        setup_kfail *-*-* "gdb/555"
+        setup_kfail "gdb/555" *-*-* 
         fail "info macro WHERE after `list macscp_4_2_from_macscp3' (gdb/555)"
     }
     timeout {
@@ -372,7 +370,7 @@ for {set i 0} {$i < [llength $funcs]} {incr i} {
     if {[string compare $result $expected] == 0} {
         pass "info macro WHERE stopped in $func"
     } elseif {[string compare $result $kfail_expected] == 0} {
-        setup_kfail *-*-* "gdb/555"
+        setup_kfail "gdb/555" *-*-* 
         fail "info macro WHERE stopped in $func (gdb/555)"
     } elseif {[string compare $result timeout] == 0} {
         fail "info macro WHERE stopped in $func (timeout)"
@@ -458,16 +456,14 @@ gdb_test "print MACRO_TO_EXPAND" \
     " = 0" \
     "print expression with macro in scope."
 
-gdb_test "macro define MACRO_TO_EXPAND 72" \
-  "" \
+gdb_test_no_output "macro define MACRO_TO_EXPAND 72" \
   "user macro override"
 
 gdb_test "print MACRO_TO_EXPAND" \
   " = 72" \
   "choose user macro"
 
-gdb_test "macro undef MACRO_TO_EXPAND" \
-  "" \
+gdb_test_no_output "macro undef MACRO_TO_EXPAND" \
   "remove user override"
 
 gdb_test "print MACRO_TO_EXPAND" \
@@ -480,8 +476,7 @@ gdb_test "print MACRO_TO_EXPAND" \
     "No symbol \"MACRO_TO_EXPAND\" in current context\." \
     "print expression with macro after undef."
 
-gdb_test "macro define MACRO_TO_EXPAND 5" \
-  "" \
+gdb_test_no_output "macro define MACRO_TO_EXPAND 5" \
   "basic macro define"
 
 gdb_test "print MACRO_TO_EXPAND" \
@@ -492,16 +487,14 @@ gdb_test "macro list" \
   "macro define MACRO_TO_EXPAND 5" \
   "basic macro list"
 
-gdb_test "macro define MACRO_TO_EXPAND(x) x" \
-  "" \
+gdb_test_no_output "macro define MACRO_TO_EXPAND(x) x" \
   "basic redefine, macro with args"
 
 gdb_test "print MACRO_TO_EXPAND (7)" \
   " = 7" \
   "expansion of macro with arguments"
 
-gdb_test "macro undef MACRO_TO_EXPAND" \
-  "" \
+gdb_test_no_output "macro undef MACRO_TO_EXPAND" \
   "basic macro undef"
 
 gdb_test "print MACRO_TO_EXPAND" \
@@ -568,8 +561,7 @@ gdb_expect  {
         timeout         { fail "(timeout) complete 'p FORTY_' 2" }
         }
 
-gdb_test "macro define TWENTY_THREE 25" \
-  "" \
+gdb_test_no_output "macro define TWENTY_THREE 25" \
   "defining TWENTY_THREE"
 
 # User-defined macros are always in scope.
@@ -594,8 +586,7 @@ gdb_test "macro expand SPLICE(x, y)" \
   "expands to: xy" \
   "basic macro splicing"
 
-gdb_test "macro define robotinvasion 2010" \
-  "" \
+gdb_test_no_output "macro define robotinvasion 2010" \
   "define splice helper"
 
 gdb_test "macro expand SPLICE(robot, invasion)" \
@@ -604,20 +595,16 @@ gdb_test "macro expand SPLICE(robot, invasion)" \
 
 # Varargs tests.
 
-gdb_test "macro define va_c99(...) varfunc (fixedarg, __VA_ARGS__)" \
-  "" \
+gdb_test_no_output "macro define va_c99(...) varfunc (fixedarg, __VA_ARGS__)" \
   "define first varargs helper"
 
-gdb_test "macro define va2_c99(x, y, ...) varfunc (fixedarg, x, y, __VA_ARGS__)" \
-  "" \
+gdb_test_no_output "macro define va2_c99(x, y, ...) varfunc (fixedarg, x, y, __VA_ARGS__)" \
   "define second varargs helper"
 
-gdb_test "macro define va_gnu(args...) varfunc (fixedarg, args)" \
-  "" \
+gdb_test_no_output "macro define va_gnu(args...) varfunc (fixedarg, args)" \
   "define third varargs helper"
 
-gdb_test "macro define va2_gnu(args...) varfunc (fixedarg, ## args)" \
-  "" \
+gdb_test_no_output "macro define va2_gnu(args...) varfunc (fixedarg, ## args)" \
   "define fourth varargs helper"
 
 gdb_test "macro expand va_c99(one, two, three)" \
@@ -646,16 +633,13 @@ gdb_test "macro expand va2_gnu()" \
 
 # Stringification tests.
 
-gdb_test "macro define str(x) #x" \
-  "" \
+gdb_test_no_output "macro define str(x) #x" \
   "define stringification macro"
 
-gdb_test "macro define maude 5" \
-  "" \
+gdb_test_no_output "macro define maude 5" \
   "define first stringification helper"
 
-gdb_test "macro define xstr(x) str(x)" \
-  "" \
+gdb_test_no_output "macro define xstr(x) str(x)" \
   "define second stringification helper"
 
 gdb_test "print str(5)" \
@@ -687,9 +671,9 @@ gdb_test "print xstr(maude)" \
   "stringify with substitution"
 
 # Regression test for pp-number bug.
-gdb_test "macro define si_addr fields.fault.si_addr" \
-  "" \
+gdb_test_no_output "macro define si_addr fields.fault.si_addr" \
   "define si_addr macro"
+
 gdb_test "macro expand siginfo.si_addr" \
   "expands to: siginfo.fields.fault.si_addr" \
   "macro expand siginfo.si_addr"