From 947dd42ddec635940c676f403e6a68cf5c6bf5cb Mon Sep 17 00:00:00 2001
From: jkratoch <>
Date: Mon, 22 Mar 2010 00:13:07 +0000
Subject: [PATCH] Ugly hacked in -N.

---
 bin/diffgdb    | 21 +++++++++++++++------
 bin/diffgdbdir | 28 +++++++++++++++++++---------
 2 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/bin/diffgdb b/bin/diffgdb
index 02bc94e..6ad817a 100755
--- a/bin/diffgdb
+++ b/bin/diffgdb
@@ -16,7 +16,6 @@ qr{^.UNTESTED: }o,
 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,
@@ -64,9 +63,19 @@ qr{^."uplevel #0 source .*gdb/testsuite/gdb.threads/watchthreads-thr.*\.\.\."\n$
 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;
@@ -101,7 +110,7 @@ while (<DIFF>) {
   }
   $this->{"buffer"}.=$_;
   next if /^ /;
-  next if /^[+]Running / && $thisname;
+  next if /^[+]Running / && $thisname && !$opt_new;
   next if /^[+]PASS: /;
   next if /^[+]KPASS: /;
   next if /^-PASS: /;
@@ -120,7 +129,7 @@ while (<DIFF>) {
 
   $this->{"print"}=1;
   print $lastfile||""; $lastfile=undef();
-  print "\n#".$this->{"name"}."\n";
+  print "\n#".($this->{"name"}||"???")."\n";
   print $this->{"buffer"}; $this->{"buffer"}=undef();
   next;
 }
diff --git a/bin/diffgdbdir b/bin/diffgdbdir
index d29fa10..ef1941b 100755
--- a/bin/diffgdbdir
+++ b/bin/diffgdbdir
@@ -2,15 +2,25 @@
 
 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"
-- 
1.8.3.1