On Tue, 2016-06-21 at 21:09 -0600, Jeff Law wrote: > On 06/03/2016 05:24 AM, Marcin Baczyński wrote: > > Hi, > > the patch below fixes PR/42014. Although the fix itself seems easy > > enough, > > I have a problem with the test. Is there a way to match the output > > before > > the "warning:" line? dg-{begin,end}-multiline-output doesn't do the > > job, or > > at least I don't know how to convince it. > > > > Bootstrapped on x86_64 linux. > > > > Thanks, > > Marcin > > > > > > gcc/ChangeLog: > > > > PR/42014 > > > > * diagnostic.c (diagnostic_report_current_module): Print column > > numbers > > for all mentioned files if context->show_column. > > > > gcc/testsuite/ChangeLog: > > > > PR/42014 > > > > * gcc.dg/inclusion-trace-column.i: New test. > The change itself seems reasonable. You might contact David Malcolm > (dmalc...@redhat.com) directly to see if he's got any ideas on how to > convince the multi-line test to do what you want. Let's hold off > installing the fix until we've got the testsuite issue sorted out.
You could turn up the verbosity level to debug things, by running something like: make check-gcc RUNTESTFLAGS="-v -v -v -v dg.exp=inclusion-trace-column.i" (multiline.exp prints various things at verbosity level 3 and 4, iirc; in particular, it can show you the regexp it's looking for). Maybe a tabs vs spaces issue? Dave