From patchwork Fri Mar 25 18:35:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josef Bacik X-Patchwork-Id: 8672741 Return-Path: X-Original-To: patchwork-fstests@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id E9F2A9F326 for ; Fri, 25 Mar 2016 18:35:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1558520357 for ; Fri, 25 Mar 2016 18:35:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1F29C20340 for ; Fri, 25 Mar 2016 18:35:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753806AbcCYSfz (ORCPT ); Fri, 25 Mar 2016 14:35:55 -0400 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:7366 "EHLO mx0b-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753207AbcCYSfz (ORCPT ); Fri, 25 Mar 2016 14:35:55 -0400 Received: from pps.filterd (m0001255.ppops.net [127.0.0.1]) by mx0b-00082601.pphosted.com (8.16.0.11/8.16.0.11) with SMTP id u2PIYZQv016201 for ; Fri, 25 Mar 2016 11:35:54 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fb.com; h=from : to : subject : date : message-id : mime-version : content-type; s=facebook; bh=Kq6Tu37Vm6Ldm/4oqTbqkooRYQUJnFPFYIRSs+PHqds=; b=I2IQSVnP73HjUfoQVd6dp9o9PubVFDGAR5M6O7KH8ugsuFoJfMrwSNTdv2GR3BCKMBUU pLdRHuW/eyy7GA0NQPdGXpazFz3Y+Zy5r5jOydYSBOXTGFpS8NCjkwoa6yEo+87rBP9m kaPBAMMQJOmDMkmj9ZyEYJAoOSlEQ/91fDc= Received: from mail.thefacebook.com ([199.201.64.23]) by mx0b-00082601.pphosted.com with ESMTP id 21vva6jwft-1 (version=TLSv1 cipher=AES128-SHA bits=128 verify=NOT) for ; Fri, 25 Mar 2016 11:35:54 -0700 Received: from localhost (192.168.52.123) by mail.thefacebook.com (192.168.16.13) with Microsoft SMTP Server (TLS) id 14.3.248.2; Fri, 25 Mar 2016 11:35:52 -0700 From: Josef Bacik To: Subject: [PATCH] fstests: make results/check.log match everybody else Date: Fri, 25 Mar 2016 14:35:50 -0400 Message-ID: <1458930950-22356-1-git-send-email-jbacik@fb.com> X-Mailer: git-send-email 2.5.0 MIME-Version: 1.0 X-Originating-IP: [192.168.52.123] X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-03-25_05:, , signatures=0 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP results/check.log is inconsistent with what goes to stdout and $tmp.summary. It passes the ran and failed tests through fmt but not the "Not Run" tests for some reason, and nobody else passes it through fmt. So fix this to be the same output as what goes to stdout and $tmp.summary to make for easier post parsing. Now we'll get Ran: Not run: Failures: Signed-off-by: Josef Bacik --- check | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/check b/check index 2986d84..5be183f 100755 --- a/check +++ b/check @@ -342,17 +342,18 @@ END { if (NR > 0) { echo "" >>$check.log date >>$check.log - echo $list | fmt | sed -e 's/^/ /' -e "s;$SRC_DIR/;;g" >>$check.log - $interrupt && echo "Interrupted!" >>$check.log echo "SECTION -- $section" >>$tmp.summary echo "=========================" >>$tmp.summary if [ ! -z "$n_try" -a $n_try != 0 ] then echo "Ran:$try" + echo "Ran:$try" >>$check.log echo "Ran:$try" >>$tmp.summary fi + $interrupt && echo "Interrupted!" >>$check.log + if [ ! -z "$notrun" ] then echo "Not run:$notrun" @@ -364,7 +365,7 @@ END { if (NR > 0) { then echo "Failures:$bad" echo "Failed $n_bad of $n_try tests" - echo "Failures:$bad" | fmt >>$check.log + echo "Failures:$bad" >>$check.log echo "Failed $n_bad of $n_try tests" >>$check.log echo "Failures:$bad" >>$tmp.summary echo "Failed $n_bad of $n_try tests" >>$tmp.summary