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) From patchwork Thu May 30 09:09:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caspar Zhang X-Patchwork-Id: 1107630 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 45F1yB1fnZz9s55 for ; Thu, 30 May 2019 19:10:26 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 5AC0E3EA72D for ; Thu, 30 May 2019 11:10:23 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-5.smtp.seeweb.it (in-5.smtp.seeweb.it [217.194.8.5]) by picard.linux.it (Postfix) with ESMTP id 854603EA1DA for ; Thu, 30 May 2019 11:10:17 +0200 (CEST) Received: from out30-131.freemail.mail.aliyun.com (out30-131.freemail.mail.aliyun.com [115.124.30.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by in-5.smtp.seeweb.it (Postfix) with ESMTPS id 84430600B80 for ; Thu, 30 May 2019 11:10:17 +0200 (CEST) X-Alimail-AntiSpam: AC=PASS; BC=-1|-1; BR=01201311R181e4; CH=green; DM=||false|; FP=0|-1|-1|-1|0|-1|-1|-1; HT=e01e04426; MF=caspar@linux.alibaba.com; NM=1; PH=DS; RN=3; SR=0; TI=SMTPD_---0TT.sgg1_1559207410; Received: from linux.alibaba.com(mailfrom:caspar@linux.alibaba.com fp:SMTPD_---0TT.sgg1_1559207410) by smtp.aliyun-inc.com(127.0.0.1); Thu, 30 May 2019 17:10:12 +0800 From: Caspar Zhang To: Cyril Hrubis Date: Thu, 30 May 2019 17:09:57 +0800 Message-Id: <5e8374fa7f4ea9d64cdfc39a2ca449761327c257.1559207183.git.caspar@casparzhang.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: References: MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.99.2 at in-5.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-5.smtp.seeweb.it Cc: LTP List Subject: [LTP] [PATCH 2/3] lib/test.sh: TCONF needs to be counted 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" TCONF should also be one of exit statuses in a single test, else the output of TST_COUNT in shell tests could be wrong. Wrong: <<>> memcg_use_hierarchy_test 1 TINFO: Starting test 1 memcg_use_hierarchy_test 1 TINFO: set /dev/memcg/memory.use_hierarchy to 0 failed memcg_use_hierarchy_test 1 TPASS: process 28658 is killed memcg_use_hierarchy_test 2 TINFO: Starting test 2 memcg_use_hierarchy_test 2 TINFO: set /dev/memcg/memory.use_hierarchy to 0 failed memcg_use_hierarchy_test 2 TCONF: memory.use_hierarchy already been 1, blame systemd, skip memcg_use_hierarchy_test 2 TINFO: Starting test 3 memcg_use_hierarchy_test 2 TINFO: set /dev/memcg/memory.use_hierarchy to 0 failed memcg_use_hierarchy_test 2 TPASS: echo 0 > subgroup/memory.use_hierarchy failed as expected <<>> Right: <<>> memcg_use_hierarchy_test 1 TINFO: Starting test 1 memcg_use_hierarchy_test 1 TINFO: set /dev/memcg/memory.use_hierarchy to 0 failed memcg_use_hierarchy_test 1 TPASS: process 26825 is killed memcg_use_hierarchy_test 2 TINFO: Starting test 2 memcg_use_hierarchy_test 2 TINFO: set /dev/memcg/memory.use_hierarchy to 0 failed memcg_use_hierarchy_test 2 TCONF: memory.use_hierarchy already been 1, blame systemd, skip memcg_use_hierarchy_test 3 TINFO: Starting test 3 memcg_use_hierarchy_test 3 TINFO: set /dev/memcg/memory.use_hierarchy to 0 failed memcg_use_hierarchy_test 3 TPASS: echo 0 > subgroup/memory.use_hierarchy failed as expected <<>> Signed-off-by: Caspar Zhang --- testcases/lib/test.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/testcases/lib/test.sh b/testcases/lib/test.sh index 670248ee5..ade8fcdff 100644 --- a/testcases/lib/test.sh +++ b/testcases/lib/test.sh @@ -58,8 +58,7 @@ tst_resm() echo " $@" case "$ret" in - TPASS|TFAIL) - TST_COUNT=$((TST_COUNT+1));; + TPASS|TFAIL|TCONF) TST_COUNT=$((TST_COUNT+1));; esac } From patchwork Thu May 30 09:09:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Caspar Zhang X-Patchwork-Id: 1107631 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 45F1yG1JYZz9s55 for ; Thu, 30 May 2019 19:10:30 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id CF8933EA792 for ; Thu, 30 May 2019 11:10:26 +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 [IPv6:2001:4b78:1:20::6]) by picard.linux.it (Postfix) with ESMTP id 91DAA3EA02C for ; Thu, 30 May 2019 11:10:17 +0200 (CEST) Received: from out30-130.freemail.mail.aliyun.com (out30-130.freemail.mail.aliyun.com [115.124.30.130]) (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 52043140127A for ; Thu, 30 May 2019 11:10:15 +0200 (CEST) X-Alimail-AntiSpam: AC=PASS; BC=-1|-1; BR=01201311R131e4; CH=green; DM=||false|; FP=0|-1|-1|-1|0|-1|-1|-1; HT=e01e04394; MF=caspar@linux.alibaba.com; NM=1; PH=DS; RN=3; SR=0; TI=SMTPD_---0TT.sggU_1559207412; Received: from linux.alibaba.com(mailfrom:caspar@linux.alibaba.com fp:SMTPD_---0TT.sggU_1559207412) by smtp.aliyun-inc.com(127.0.0.1); Thu, 30 May 2019 17:10:12 +0800 From: Caspar Zhang To: Cyril Hrubis Date: Thu, 30 May 2019 17:09:58 +0800 Message-Id: <1985f9e48c4557c2ec52eded11d08f3b7b514962.1559207183.git.caspar@casparzhang.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: References: 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 3/3] tst_test.sh, test.sh: report pass if both TPASS and TCONF exist in shell test 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" We don't want the test reporting TCONF if at least one TPASS existed during testing. And this is also true in shell tests. So fix it. Signed-off-by: Caspar Zhang Reviewed-by: Li Wang --- testcases/lib/test.sh | 9 +++++++++ testcases/lib/tst_test.sh | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/testcases/lib/test.sh b/testcases/lib/test.sh index ade8fcdff..7cc3bb2fe 100644 --- a/testcases/lib/test.sh +++ b/testcases/lib/test.sh @@ -23,6 +23,7 @@ export LTP_RET_VAL=0 export TST_COUNT=1 +export TST_PASS_COUNT=0 export TST_LIB_LOADED=1 export TST_TMPDIR_RHOST=0 @@ -60,6 +61,10 @@ tst_resm() case "$ret" in TPASS|TFAIL|TCONF) TST_COUNT=$((TST_COUNT+1));; esac + + if [ "$ret" = TPASS ]; then + TST_PASS_COUNT=$((TST_PASS_COUNT+1)) + fi } tst_brkm() @@ -111,6 +116,10 @@ tst_exit() rm -f "$LTP_IPC_PATH" fi + # Mask out TCONF if no TFAIL/TBROK/TWARN but has TPASS + if [ $((LTP_RET_VAL & 7)) -eq 0 -a $TST_PASS_COUNT -gt 0 ]; then + LTP_RET_VAL=$((LTP_RET_VAL & ~32)) + fi # Mask out TINFO exit $((LTP_RET_VAL & ~16)) } diff --git a/testcases/lib/tst_test.sh b/testcases/lib/tst_test.sh index 512732315..bf725fdde 100644 --- a/testcases/lib/tst_test.sh +++ b/testcases/lib/tst_test.sh @@ -78,7 +78,7 @@ _tst_do_exit() ret=$((ret|4)) fi - if [ $TST_CONF -gt 0 ]; then + if [ $TST_CONF -gt 0 -a $TST_PASS -eq 0 ]; then ret=$((ret|32)) fi