Make -r more raw.

diff --git a/bin/diffgdb b/bin/diffgdb
index 6ad817a..9aedafd 100755 (executable)
--- a/bin/diffgdb
+++ b/bin/diffgdb
@@ -3,7 +3,13 @@ use strict;
 use warnings;
 
 my @ignore=(
 use warnings;
 
 my @ignore=(

+qr{^.PASS: }o,
+qr{^.KPASS: }o,
+qr{^-FAIL: }o,
+qr{^-KFAIL: }o,
+qr{^-XFAIL: }o,

 qr{^.Test Run By }o,
 qr{^.Test Run By }o,

+qr{^.Running }o,

 qr{^.gnatbind }o,
 qr{^.gnatlink }o,
 qr{^.gnatlink: }o,
 qr{^.gnatbind }o,
 qr{^.gnatlink }o,
 qr{^.gnatlink: }o,


@@ -58,7 +64,7 @@ qr{^.(?:PASS|FAIL): gdb.mi/mi-simplerun.exp: continue to end(?: \(unknown output
 qr{^.(?:PASS|FAIL): gdb.server/file-transfer.exp: verified deleted binary file\n$}o,
 qr{^.(?:PASS|FAIL): gdb.server/file-transfer.exp: deleted binary file\n$}o,
 qr{^.(?:PASS|FAIL): gdb.threads/attachstop-mt.exp: attach1, post-gdb sanity check of the sleeping state - Red Hat BZ 197584\n$}o,
 qr{^.(?:PASS|FAIL): gdb.server/file-transfer.exp: verified deleted binary file\n$}o,
 qr{^.(?:PASS|FAIL): gdb.server/file-transfer.exp: deleted binary file\n$}o,
 qr{^.(?:PASS|FAIL): gdb.threads/attachstop-mt.exp: attach1, post-gdb sanity check of the sleeping state - Red Hat BZ 197584\n$}o,

-qr{^."uplevel #0 source .*gdb/testsuite/gdb.threads/watchthreads-thr.*\.\.\."\n$}o,
+qr{^."uplevel #0 source .*gdb/testsuite/gdb.threads/watchthreads-thr(?:eaded\.exp|.*\.\.\.)"\n$}o,

 );
 my $ignore=shift @ignore;
 $ignore=qr/$ignore|$_/ for @ignore;
 );
 my $ignore=shift @ignore;
 $ignore=qr/$ignore|$_/ for @ignore;


@@ -111,13 +117,6 @@ while (<DIFF>) {
   $this->{"buffer"}.=$_;
   next if /^ /;
   next if /^[+]Running / && $thisname && !$opt_new;
   $this->{"buffer"}.=$_;
   next if /^ /;
   next if /^[+]Running / && $thisname && !$opt_new;

-  next if /^[+]PASS: /;
-  next if /^[+]KPASS: /;
-  next if /^-PASS: /;
-  next if /^-KPASS: /;
-  next if /^-FAIL: /;
-  next if /^-KFAIL: /;
-  next if /^-XFAIL: /;

   next if $ignore && /$ignore/o;
   next if /^[+]FAIL: / && $this->{"+Running"};
   next if /^[+]KFAIL: / && $this->{"+Running"};
   next if $ignore && /$ignore/o;
   next if /^[+]FAIL: / && $this->{"+Running"};
   next if /^[+]KFAIL: / && $this->{"+Running"};