From patchwork Thu May 30 09:09:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caspar Zhang X-Patchwork-Id: 1107628 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.alibaba.com Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45F1y61FPqz9s5c for ; Thu, 30 May 2019 19:10:21 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 119173EA64C for ; Thu, 30 May 2019 11:10:19 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-6.smtp.seeweb.it (in-6.smtp.seeweb.it [217.194.8.6]) by picard.linux.it (Postfix) with ESMTP id B6E6D3EA1DA for ; Thu, 30 May 2019 11:10:16 +0200 (CEST) Received: from out30-54.freemail.mail.aliyun.com (out30-54.freemail.mail.aliyun.com [115.124.30.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by in-6.smtp.seeweb.it (Postfix) with ESMTPS id D7F521401252 for ; Thu, 30 May 2019 11:10:13 +0200 (CEST) X-Alimail-AntiSpam: AC=PASS; BC=-1|-1; BR=01201311R281e4; CH=green; DM=||false|; FP=0|-1|-1|-1|0|-1|-1|-1; HT=e01e01422; MF=caspar@linux.alibaba.com; NM=1; PH=DS; RN=3; SR=0; TI=SMTPD_---0TT.cSLj_1559207409; Received: from linux.alibaba.com(mailfrom:caspar@linux.alibaba.com fp:SMTPD_---0TT.cSLj_1559207409) by smtp.aliyun-inc.com(127.0.0.1); Thu, 30 May 2019 17:10:10 +0800 From: Caspar Zhang To: Cyril Hrubis Date: Thu, 30 May 2019 17:09:56 +0800 Message-Id: X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.99.2 at in-6.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=-7.5 required=7.0 tests=ENV_AND_HDR_SPF_MATCH, SPF_HELO_NONE, SPF_PASS, USER_IN_DEF_SPF_WL autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-6.smtp.seeweb.it Cc: LTP List Subject: [LTP] [PATCH 1/3] tst_test: fix again when test has both TPASS and TCONF X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.18 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" Consider this situation: we get only TPASS and TCONF in test results, and the last status happens to be TPASS, the check condition in commit fecdd885eb4b ("tst_test: Fix exit value on tst_brk(TCONF, ...)" won't work. Fix it by removing unnecessary TCONF check. Fixes: 5390d6ea3657 ("lib/tst_test: Report 0 if test has both TPASS and TCONF") Signed-off-by: Caspar Zhang --- lib/tst_test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/tst_test.c b/lib/tst_test.c index 2d88adbd7..8ba122fbe 100644 --- a/lib/tst_test.c +++ b/lib/tst_test.c @@ -594,7 +594,7 @@ static void do_exit(int ret) printf("skipped %d\n", results->skipped); printf("warnings %d\n", results->warnings); - if (results->passed && ret == TCONF) + if (results->passed) ret = 0; if (results->failed)