This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
[RFA:] Make ld run_dump_test directives error and warning concatenate
- From: Hans-Peter Nilsson <hans-peter dot nilsson at axis dot com>
- To: binutils at sourceware dot org
- Date: Wed, 31 Mar 2010 05:02:53 +0200
- Subject: [RFA:] Make ld run_dump_test directives error and warning concatenate
Without this, lines in .d-files may in some cases have to be
unpleasantly long. Almost trivial enough.
Tested with the other patch check-ld on native i686-pc-linux-gnu
and crosses to cris-axis-elf cris-axis-linux-gnu arm-linux
arm-elf bfin-uclinux dlx-elf mmix-knuth-mmixware vax-linux
m68k-linux mips-linux sh-elf sh64-elf and x86_64-linux.
Ok to commit?
ld/testsuite:
* lib/ld-lib.exp (run_dump_test): Include "warning" and "error"
among the directives where multiples are allowed and append to
previous values.
Index: ld-lib.exp
===================================================================
RCS file: /cvs/src/src/ld/testsuite/lib/ld-lib.exp,v
retrieving revision 1.69
diff -p -u -r1.69 ld-lib.exp
--- ld-lib.exp 19 Mar 2010 14:49:46 -0000 1.69
+++ ld-lib.exp 31 Mar 2010 03:00:39 -0000
@@ -654,11 +654,13 @@ proc simple_diff { file_1 file_2 } {
# error: REGEX
# An error with message matching REGEX must be emitted for the test
# to pass. The PROG, objdump, nm and objcopy options have no
-# meaning and need not supplied if this is present.
+# meaning and need not supplied if this is present. Multiple "error"
+# directives append to the expected linker error message.
#
# warning: REGEX
# Expect a linker warning matching REGEX. It is an error to issue
-# both "error" and "warning".
+# both "error" and "warning". Multiple "warning" directives
+# append to the expected linker warning message.
#
# Each option may occur at most once unless otherwise mentioned.
#
@@ -725,6 +727,8 @@ proc run_dump_test { name } {
xfail {}
target {}
notarget {}
+ warning {}
+ error {}
source {
# Move any source-specific as-flags to a separate array to
# simplify processing.
brgds, H-P