diff mbox series

[FFmpeg-devel,fateserver] Include slot owner in summary hash

Message ID 20200120194616.9574-1-martin@martin.st
State Superseded
Headers show
Series [FFmpeg-devel,fateserver] Include slot owner in summary hash | expand

Checks

Context Check Description
andriy/ffmpeg-patchwork fail Failed to apply patch

Commit Message

Martin Storsjö Jan. 20, 2020, 7:46 p.m. UTC 
From: Mans Rullgard <mans@mansr.com>

---
I think this should allow filtering on the owner by doing
/index.cgi?query=owner:<name>, but as I don't have access to the
actual fate server, I'd appreciate if someone could try it out.
---
 FATE.pm    | 14 +++++++++++++-
 report.cgi |  8 +-------
 2 files changed, 14 insertions(+), 8 deletions(-)

Comments

Michael Niedermayer Jan. 21, 2020, 9:53 a.m. UTC | #1 
On Mon, Jan 20, 2020 at 09:46:16PM +0200, Martin Storsjo wrote:
> From: Mans Rullgard <mans@mansr.com>
> 
> ---
> I think this should allow filtering on the owner by doing
> /index.cgi?query=owner:<name>, but as I don't have access to the
> actual fate server, I'd appreciate if someone could try it out.
> ---
>  FATE.pm    | 14 +++++++++++++-
>  report.cgi |  8 +-------
>  2 files changed, 14 insertions(+), 8 deletions(-)

seems working
can you provide a patch with proper commit message and a 
sign-off / reviewed-by or something like that ? (iam no perl programmer
so i would not trust myself in reviewing this if i can avoid it)
with that ill push to https://git.ffmpeg.org/fateserver

Thanks


[...]
diff mbox series

Patch

diff --git a/FATE.pm b/FATE.pm
index 86ffe07..50b5c69 100644
--- a/FATE.pm
+++ b/FATE.pm
@@ -99,6 +99,18 @@  sub split_rec {
     };
 }
 
+sub owner {
+    my ($slot) = @_;
+    my $owner;
+
+    if (open O, "$fatedir/$slot/owner") {
+        chomp($owner = <O>);
+        close O;
+    }
+
+    return $owner;
+}
+
 sub load_summary {
     my ($slot, $date) = @_;
     my $repdir = "$fatedir/$slot/$date";
@@ -109,7 +121,7 @@  sub load_summary {
         my $conf = split_config scalar <S> or return;
         my $st   = split_stats  scalar <S> or return;
         close S;
-        return { %$hdr, %$conf, %$st };
+        return { %$hdr, %$conf, %$st, owner => owner $slot };
     }
 
     return if not -f "$repdir/report.xz";
diff --git a/report.cgi b/report.cgi
index 9ae42fd..a980617 100755
--- a/report.cgi
+++ b/report.cgi
@@ -52,12 +52,6 @@  my $ntest = $npass + $nfail;
 my $rep = load_summary $req_slot, $req_time;
 my $lastpass = load_lastpass $req_slot;
 
-my $owner;
-if (open O, "$slotdir/owner") {
-    chomp($owner = <O>);
-    close O;
-}
-
 # main text
 
 print "Content-type: text/html\r\n";
@@ -100,7 +94,7 @@  trow 'Architecture',  $$conf{arch};
 trow 'Variant',       $$conf{subarch};
 trow 'CPU',           $$conf{cpu};
 trow 'OS',            $$conf{os};
-trow 'Owner',         $owner if $owner;
+trow 'Owner',         $$rep{owner};
 trow 'Compiler',      $$conf{cc};
 trow 'Configuration', '<code>' . $$conf{config} . '</code>';
 trow 'Comment',       $$hdr{comment};