diff options
Diffstat (limited to 'ld/testsuite/lib/ld-lib.exp')
| -rw-r--r-- | ld/testsuite/lib/ld-lib.exp | 42 |
1 files changed, 39 insertions, 3 deletions
diff --git a/ld/testsuite/lib/ld-lib.exp b/ld/testsuite/lib/ld-lib.exp index de0f7ad..0444a38 100644 --- a/ld/testsuite/lib/ld-lib.exp +++ b/ld/testsuite/lib/ld-lib.exp @@ -436,7 +436,7 @@ proc ld_simple_link_defsyms {} { return $flags } -# run_dump_test FILE +# run_dump_test FILE (optional:) EXTRA_OPTIONS # Copied from gas testsuite, tweaked and further extended. # # Assemble a .s file, then run some utility on it and check the output. @@ -461,6 +461,12 @@ proc ld_simple_link_defsyms {} { # list ends with the first line that doesn't match the above syntax # (hmm, not great for error detection). # +# The optional EXTRA_OPTIONS argument to `run_dump_test' is a list of +# two-element lists. The first element of each is an option name, and +# the second additional arguments to be added on to the end of the +# option list as given in FILE.d. (If omitted, no additional options +# are added.) +# # The interesting options are: # # name: TEST-NAME @@ -508,6 +514,11 @@ proc ld_simple_link_defsyms {} { # More than one "source" directive can be given, which is useful # when testing linking. # +# dump: DUMP +# Match against DUMP.d. If omitted, this defaults to FILE.d. This +# is useful if several .d files differ by options only. Options are +# always read from FILE.d. +# # xfail: TARGET # The test is expected to fail on TARGET. This may occur more than # once. @@ -539,7 +550,7 @@ proc ld_simple_link_defsyms {} { # regexps in FILE.d. `regexp_diff' is defined in binutils-common.exp; # see further comments there. # -proc run_dump_test { name } { +proc run_dump_test { name {extra_options {}} } { global subdir srcdir global OBJDUMP NM AS OBJCOPY READELF LD global OBJDUMPFLAGS NMFLAGS ASFLAGS OBJCOPYFLAGS READELFFLAGS LDFLAGS @@ -579,6 +590,7 @@ proc run_dump_test { name } { set opts(name) {} set opts(PROG) {} set opts(source) {} + set opts(dump) {} set opts(error) {} set opts(warning) {} set opts(objcopy_linked_file) {} @@ -641,6 +653,24 @@ proc run_dump_test { name } { } } } + + foreach i $extra_options { + set opt_name [lindex $i 0] + set opt_val [lindex $i 1] + if ![info exists opts($opt_name)] { + perror "unknown option $opt_name given in extra_opts" + unresolved $subdir/$name + return + } + # Add extra option to end of existing option, adding space + # if necessary. + if { ![regexp "warning|error" $opt_name] + && [string length $opts($opt_name)] } { + append opts($opt_name) " " + } + append opts($opt_name) $opt_val + } + foreach opt { as ld } { regsub {\[big_or_little_endian\]} $opts($opt) \ [big_or_little_endian] opts($opt) @@ -721,6 +751,12 @@ proc run_dump_test { name } { } } + if { $opts(dump) == "" } { + set dfile ${file}.d + } else { + set dfile $srcdir/$subdir/$opts(dump) + } + # Time to setup xfailures. foreach targ $opts(xfail) { setup_xfail $targ @@ -876,7 +912,7 @@ proc run_dump_test { name } { } if { $verbose > 2 } then { verbose "output is [file_contents $dumpfile]" 3 } - if { [regexp_diff $dumpfile "${file}.d"] } then { + if { [regexp_diff $dumpfile "${dfile}"] } then { fail $testname if { $verbose == 2 } then { verbose "output is [file_contents $dumpfile]" 2 } return |