From patchwork Tue Jan 21 10:13:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 17453 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 0C67844AFE3 for ; Tue, 21 Jan 2020 12:21:47 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DEB7668B110; Tue, 21 Jan 2020 12:21:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f179.google.com (mail-lj1-f179.google.com [209.85.208.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DA5D068B0E0 for ; Tue, 21 Jan 2020 12:21:40 +0200 (EET) Received: by mail-lj1-f179.google.com with SMTP id o11so1833799ljc.6 for ; Tue, 21 Jan 2020 02:21:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=0rWAv99sqAE9x6il0uBRapKkZ3S7aKXtJgrNiOZZCRw=; b=umz44r/pHBd0BgmPj0kFqvn7yjb/ElB2fTUi5rnSHu7AqdVP211nmcqNtOI8mPtUkb egkdl65RGDJjOuhIcgPt2DT8AM1XCinNfyZ6qKguzVmjlt+IvcT+Q1YnDZL5SFsLo6OF oje5RnUtsPtcY1XyLT+snw7x0chhRQkhVxoHQTUjO5wAMyNRq10UF05zdDlbwACE9fcd IVmEJo0ylEi6nio6L0Zvi+5egHBwTOO0cREaMt+Ae1XWS17ehDDrFqSZFIQSTyRfZeIi dKU9SvewkLuCBsGBbRfsJgKRapz/+Fkfmxw4h6ZcZQacTfNlY7SCWW2SwZ5twcF2auGS p5+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0rWAv99sqAE9x6il0uBRapKkZ3S7aKXtJgrNiOZZCRw=; b=G8uxDxQtIBji6IugHMqdpAXnoMqb17rEFsoBuwRTtg2lu1JHIJCaz18Tl82FwJb0TL uMI2IxsNW2FqDNzhXnQyYhJi+8sleOsOQbBK6N2FpxKEs+GBfj8UL9C9am1Bm0ywkMjy 7Z2p4lt4vmIRWpouUCJ9ac2OqKJdt31QHVKC7okECVM/3dJfHD4RJmRKfiAVwUYplXO0 yz7fk25iK6Km6VgyuV1ikYVXYJZun2uTi+diTjDOiyWwsrEWC2LlUd1+51dGko2jGPTf XyRua1zinfmgR8DIU+ruUQmjFbgsVDBSx7Ruh+nWF4dbR7XGAGaknj1lUH2nIU0Y0jRu f7Ug== X-Gm-Message-State: APjAAAWQUlDB6GRY+Zi9u/5tC35mFRBlF9y0pJfcJprZ55AqUnTfAn20 VgDhbDLMyke15vuGn5dN6I/h4P2A2Ec= X-Google-Smtp-Source: APXvYqy0r4y/M2FULSUw2IBpyd6i5aLMvim7QPZglcpcVAZgXwZlrnicCDlBgj7vcqUmEdBad7/OfA== X-Received: by 2002:a05:651c:1214:: with SMTP id i20mr16417516lja.107.1579601623823; Tue, 21 Jan 2020 02:13:43 -0800 (PST) Received: from localhost.localdomain (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id t20sm17981945ljk.87.2020.01.21.02.13.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jan 2020 02:13:43 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 21 Jan 2020 12:13:42 +0200 Message-Id: <20200121101342.14010-1-martin@martin.st> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200121095335.GY3089@michaelspb> References: <20200121095335.GY3089@michaelspb> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCHv2] 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 Cc: =?utf-8?q?Martin_Storsj=C3=B6?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Mans Rullgard Signed-off-by: Martin Storsjö --- Does this look ok? I removed the [fateserver] disambiguation tag and added my own Signed-off-by to it. --- 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};