From: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Fri, 3 Oct 2014 18:26:08 +0000 (+0200)
Subject: +gitmark
X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=commitdiff_plain;h=603a7c02633bf8e9f67fdf972806803b3f533de5;ds=sidebyside

+gitmark
+2 ignore patterns
---

diff --git a/bin/diffgdb b/bin/diffgdb
index 6380007..b44c2c0 100755
--- a/bin/diffgdb
+++ b/bin/diffgdb
@@ -2,6 +2,21 @@
 use strict;
 use warnings;
 
+sub gitmark($) {
+  my($s)=@_;
+  return "" if $s!~m{^(... )([^/]*/+[^/]*)/};
+  my($pfx,$dir)=($1,$2);
+  local *GIT;
+  $dir.="/build/gdbgit";
+  return "" if !-d $dir;
+  open GIT,"cd '$dir';git log --format=%H HEAD^..HEAD|" or return "";
+  my $git=do { local $/; <GIT>; };
+  close GIT;
+  chomp $git;
+  return "${pfx}GIT commit $git\n" if $git=~/^[0-9a-f]{40}$/;
+  return "";
+}
+
 my @ignore=(
 qr{^.PASS: }o,
 qr{^.KPASS: }o,
@@ -39,6 +54,8 @@ qr{\bgdb version  \d\S+ -nw -nx\b}o,
 qr{^.FAIL: \S+\.exp: valgrind check \d+\n$}o,
 qr{^.KFAIL: gdb.threads/watchthreads2.exp: gdb can drop watchpoints in multithreaded app \(PRMS: gdb/10116\)\n$}o,
 qr{^.FAIL: gdb.base/info-os.exp: .*\n$}o,
+qr{^.FAIL: gdb.threads/multiple-step-overs.exp: .*\n$}o,
+qr{^.FAIL: gdb.base/random-signal.exp: stop with control-c \Q(timeout)\E\n$}o,
 );
 my $ignore=shift @ignore;
 $ignore=qr/$ignore|$_/ for @ignore;
@@ -85,11 +102,11 @@ while (<DIFF>) {
     $lastfile=$_;
   }
   if (/^--- /) {
-    $lastfile=$_;
+    $lastfile=$_.gitmark($_);
     next;
   }
   if (/^\Q+++\E /) {
-    $lastfile.=$_;
+    $lastfile.=$_.gitmark($_);
     next;
   }
   $this->{"buffer"}.=$_;