From patchwork Mon Jan 20 19:46:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 17442 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 3801E44BD0F for ; Mon, 20 Jan 2020 21:46:27 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1022F68AC26; Mon, 20 Jan 2020 21:46:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f53.google.com (mail-lf1-f53.google.com [209.85.167.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DA19A68AC26 for ; Mon, 20 Jan 2020 21:46:19 +0200 (EET) Received: by mail-lf1-f53.google.com with SMTP id i23so204480lfo.7 for ; Mon, 20 Jan 2020 11:46:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=w5IK8qhhlL68KJ7YvEuHo4RX88PnoCveaoHkJPudpWA=; b=hvQNBCzk2HQe+efbhiVtbkB8szy53FZBHLze7UzzE11Gl6qA+jOCXkkfJneN4YGo1e EPL3Ar4tOVr5Z5UXhdIeAhlzhlu4KassvK9qsktNKgZhtNByoPSoG6c81ry8d+9Q8SSt MJuGalZPBGSoNtMiKM5Anvhk/PKf1RfDuHeg46sn2T83OyVWx+78jyEp70j4MlkZFAYv /ZyrADRxx7dDeUJmMM/iJVa521OSgv41mzaLKXdhodtMM/pcR4drUXiogT5dnWnfYnYM Fiby8B91ZZlxxB255NRAliyIHj8vx2znq7EO/kMvyMs9Cn152NkKsr+01ZfUIWZwqYc1 9H0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=w5IK8qhhlL68KJ7YvEuHo4RX88PnoCveaoHkJPudpWA=; b=KbBaedixBoQiUHU9oGnIZPDewaTMST+7HAPAZQbbXWm2I0IIyQ26VlvjzfXUDQ7UH/ lvAXZdXN7/pOsAeQWpw1nxgWCZIbCmw870MYm70pOeE/Nbc0YaDus6P98/KKimJTw1Bo W2HecEg9MTXU0kUqJCZoOWmHzPcT6WN6v7UN9jKkaToOCI0BM+VIQVcamGMLZHHGOjB8 NT3T2xYjyBSJPRSkOIsePdl+0wA81Gyoq4UBtiwEj9PhGrMLYranfWuXzSIKH8CMwXBW 9ZYRG48WGeZ5gT1AMxy1nNWMp7Pcd3frgnROa+IqJs7oIMugRhFe7tSKUATGF/Nrw23W JpLw== X-Gm-Message-State: APjAAAW1Q1s6rcKqi+yrWlxEiu4NUwA73UjmIpXwH1H2LDzhbzlGdYr9 Tjka16rtf3oG3nvL9eITcusRiHeuvd0= X-Google-Smtp-Source: APXvYqyfs2sqSonSj6QmyKc9PiEtLzO+8TwQaCNzU+6eWw7FDe6Dm0PnEvK6E1APSsKvnS3RRyA1pA== X-Received: by 2002:ac2:5f49:: with SMTP id 9mr485310lfz.151.1579549578755; Mon, 20 Jan 2020 11:46:18 -0800 (PST) Received: from localhost.localdomain (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id a12sm17255374ljk.48.2020.01.20.11.46.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jan 2020 11:46:18 -0800 (PST) From: Martin Storsjo To: ffmpeg-devel@ffmpeg.org Date: Mon, 20 Jan 2020 21:46:16 +0200 Message-Id: <20200120194616.9574-1-martin@martin.st> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH] [fateserver] Include slot owner in summary hash X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Mans Rullgard --- I think this should allow filtering on the owner by doing /index.cgi?query=owner:, 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(-) 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 = ); + 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 or return; my $st = split_stats scalar 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 = ); - 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', '' . $$conf{config} . ''; trow 'Comment', $$hdr{comment};