qr{^.UNRESOLVED: }o,
qr{^.ERROR: }o,
qr{^.WARNING: }o,
-qr{^.Running }o,
qr{^.[^:]*[.]ad[sb]:[0-9]}o,
qr{^.(?:PASS|FAIL): gdb.server/ext-run.exp: get process list\n$}o,
qr{^.(?:PASS|FAIL): gdb.base/checkpoint.exp: info checkpoints with at least 600 checkpoints\n$}o,
my $ignore=shift @ignore;
$ignore=qr/$ignore|$_/ for @ignore;
-if ($ARGV[0] eq "-r") {
- $ignore=undef;
- shift;
+my $opt_new;
+while (1) {
+ if ($ARGV[0] eq "-r") {
+ $ignore=undef;
+ shift;
+ next;
+ }
+ if ($ARGV[0] eq "-N") {
+ $opt_new=1;
+ shift;
+ next;
+ }
+ last;
}
my $last;
}
$this->{"buffer"}.=$_;
next if /^ /;
- next if /^[+]Running / && $thisname;
+ next if /^[+]Running / && $thisname && !$opt_new;
next if /^[+]PASS: /;
next if /^[+]KPASS: /;
next if /^-PASS: /;
$this->{"print"}=1;
print $lastfile||""; $lastfile=undef();
- print "\n#".$this->{"name"}."\n";
+ print "\n#".($this->{"name"}||"???")."\n";
print $this->{"buffer"}; $this->{"buffer"}=undef();
next;
}
x="*.log"
o=""
-if [ "$1" = "-r" ];then
- o="-r"
- shift
-fi
-if [ "$1" = "log" ];then
- x="*.sum"
- o="-r"
- shift
-fi
+while true;do
+ if [ "$1" = "-r" ];then
+ o="$o -r"
+ shift
+ continue
+ fi
+ if [ "$1" = "-N" ];then
+ o="$o -N"
+ shift
+ continue
+ fi
+ if [ "$1" = "log" ];then
+ x="*.sum"
+ o="-r"
+ shift
+ continue
+ fi
+ break
+done
if [ $# != 2 ];then
echo >&2 "$0 hammock/xxxxyyzzname hammock/XXXXYYZZothername"