-# Copyright 2011 Free Software Foundation, Inc.
+# Copyright 2011-2017 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
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-set testfile "info-macros"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-get_compiler_info ${binfile}
-if [test_compiler_info gcc*] {
- lappend options additional_flags=-g3
-} else {
- untested ${testfile}.exp
+standard_testfile .c
+
+# Fission doesn't support macros yet. Bug 15954.
+if [using_fission] {
+ untested "fission does not support macros yet"
+ return -1
+}
+
+get_compiler_info
+if ![test_compiler_info gcc*] {
+ untested "no compiler info"
return -1
}
-if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} $options] } {
- untested ${testfile}.exp
+# Don't use "debug" here. Otherwise "-g" would be appended to the gcc
+# command line, possibly overriding "-g3" (depending on gcc version).
+set options "additional_flags=-g3"
+
+if { [prepare_for_testing "failed to prepare" ${testfile} ${srcfile} $options] } {
return -1
}
if ![runto_main] {
- untested ${testfile}.exp
+ untested "could not run to main"
return -1
}
-set test "info definitions FOO"
+# Test various error messages.
+gdb_test "info macro -- -all" \
+ "The symbol `-all' has no definition .*\r\nat .*$srcfile:\[0-9\]+" \
+ "info macro -- -all"
+gdb_test "info macro -- -all" \
+ "The symbol `-all' has no definition .*\r\nat .*$srcfile:\[0-9\]+" \
+ "info macro -- -all"
+
+gdb_test "info macro -all --" \
+ "You must follow.*with the name.*you want to see.*\[^\r\n\]*\[\r\n\]" \
+ "info macro -all --"
+
+gdb_test "info macro -all --" \
+ "You must follow.*with the name.*you want to see.*\[^\r\n\]*\[\r\n\]" \
+ "info macro -all --"
+
+gdb_test "info macro -all --" \
+ "You must follow.*with the name.*you want to see.*\[^\r\n\]*\[\r\n\]" \
+ "info macro -all --"
+
+gdb_test "info macro --" \
+ "You must follow.*with the name.*you want to see.*\[^\r\n\]*\[\r\n\]" \
+ "info macro --"
+
+gdb_test "info macro -- " \
+ "You must follow.*with the name.*you want to see.*\[^\r\n\]*\[\r\n\]" \
+ "'info macro -- '"
+gdb_test "info macro -- " \
+ "You must follow.*with the name.*you want to see.*\[^\r\n\]*\[\r\n\]" \
+ "'info macro -- '"
+
+gdb_test "info macro -invalid-option" \
+ "Unrecognized option.*Try \"help info macro\"\." \
+ "info macro -invalid-option 1"
+
+gdb_test "info macro -invalid-option" \
+ "Unrecognized option.*Try \"help info macro\"\." \
+ "info macro -invalid-option"
+
+gdb_test "info macro -invalid-option FOO" \
+ "Unrecognized option.*Try \"help info macro\"\." \
+ "info macro -invalid-option FOO"
+gdb_test "info macro -invalid-option FOO" \
+ "Unrecognized option.*Try \"help info macro\"\." \
+ "info macro -invalid-option FOO"
+
+# Single macro lookups.
+gdb_test "info macro -- FOO" \
+ ".*#define FOO \"hello\"" \
+ "info macro -- FOO"
+
+gdb_test "info macro -- FOO" \
+ ".*#define FOO \"hello\"" \
+ "info macro -- FOO"
+
+gdb_test "info macro -- FOO" \
+ ".*#define FOO \"hello\"" \
+ "info macro -- FOO"
+
+gdb_test "info macro FOO" \
+ ".*#define FOO \"hello\"" \
+ "info macro FOO"
+
+gdb_test "info macro FOO" \
+ ".*#define FOO \"hello\"" \
+ "info macro FOO"
+
+# Multiple macro lookups.
+set test "info macro -a FOO"
set r1 ".*#define FOO \"hello\""
set r2 ".*#define FOO \" \""
set r3 ".*#define FOO \"world\""
set testname "$test 1"
gdb_test "$test" "$r1$r2$r3$r4" "$testname"
+set test "info macro -a -- FOO"
+set testname "$test 1"
+gdb_test "$test" "$r1$r2$r3$r4" "$testname"
+
+set test "info macro -all -- FOO"
+set testname "$test 1"
+gdb_test "$test" "$r1$r2$r3$r4" "$testname"
+
+set test "info macro -a -- FOO"
+set testname "$test"
+gdb_test "$test" "$r1$r2$r3$r4" "$testname"
+
+set test "info macro -a -- FOO"
+set testname "$test"
+gdb_test "$test" "$r1$r2$r3$r4" "$testname"
set test "info macros"
set r1 ".*#define FOO \"hello\""
set r2 ".*#define ONE"
set r3 ".*#define TWO"
set r4 ".*\r\n$gdb_prompt"
-set testname "$test 4"
+set testname "$test 3"
gdb_test_multiple "$test" $testname {
-re ".*#define THREE.*\r\n$gdb_prompt" {
fail $testname
set r2 ".*#define ONE"
set r3 ".*#define TWO."
set r4 ".*\r\n$gdb_prompt"
-set testname "$test 5"
set test "info macros"
+set testname "$test 5"
gdb_test_multiple "$test" $test {
-re ".*#define THREE.*\r\n$gdb_prompt" {
fail $testname