From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.openvz.org (mail.openvz.org [69.168.225.77]) by lore.virtuozzo.com (Postfix) with ESMTPS id 8701F80CB2 for ; Tue, 27 Oct 2026 15:54:14 +0000 (UTC) Received: from mail.openvz.org (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 69RFr1Sd030293; Tue, 27 Oct 2026 18:53:02 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 69RFr1Sd030293 Authentication-Results: mail.openvz.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="LG28tTtC" Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id 69RFqi3Z030240 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=FAIL) for ; Tue, 27 Oct 2026 18:52:44 +0300 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.openvz.org 69RFqi3Z030240 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-4a4af69e06fso20083915e9.2 for ; Tue, 27 Oct 2026 08:52:44 -0700 (PDT) X-Gm-Message-State: AFq9FYIXonDG1/PMwUwnR7BkU7ngti/puGjpZEF95+72Eak0yJ/6ObdN OCq/NvINjSdq7XohVyXOXefDs20+qTURM4FtO5wK3gNPiQQCmIbkWf1KoVDBekQPLzjWehzAcCw 8QTvPuyTVGgazjMMrjEMZVoSmKq6uVMN1jqPLkhD6U6ZSJVvM97tOVg== X-Gm-Gg: AYBFou1cxQAHMaQEOKWbkvfgkxQy1qRArkyuo5spl/X+5ZJzSYona4Ey8u2pTqYN/Gs F5lAr6K2dOfRuFGr0K3C0sHNlb7r57atFYTRuOKTtK9X5rjZ/HatiiM79kRIIqJvTNLd17KGr+N VrwSS5VQVM0ZCaJSGBVO2IOpNT5wMe5JUXteiKGYnOCkUtjUDqS7hcy479kPxiTKR1fLXZqqsOj 2qmeDYMCNfae9TB2UQbJRG7pnRBYWmfoYdPvWbro4+y+yrDUcl36eL4FKmBtyRmzM7bwzDPH7PA vdwybrQmwdKa4DBc9B4nJF4o7LdycxeHydsClLmMm1csWGaMDub9wyV3S+zxKOnoTHRw5L5v6Wr 9DRrXHRwvk0c219RYqMNn+FP4oA== X-Received: by 2002:a05:600c:474a:b0:4a1:d97e:cd60 with SMTP id 5b1f17b1804b1-4a35ac91f2amr214143975e9.16.1793116363607; Tue, 27 Oct 2026 08:52:43 -0700 (PDT) X-Received: by 2002:a05:600c:474a:b0:4a1:d97e:cd60 with SMTP id 5b1f17b1804b1-4a35ac91f2amr214142935e9.16.1793116362738; Tue, 27 Oct 2026 08:52:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1793116362; cv=none; d=google.com; s=arc-20260327; b=oHgyFPUGQo+t//UJslA9TgWuPiQFy9sgV2DFAtqs6PI9FomSAGlIiINnwzMiojZg80 taVvZDSxiDfFzGcXlCY2TH0q2dkWVelNRieepW4Qauqf+R5hEZEGJ9QKdUiNJHUH/BKX KUG/XpFCiKiWPIHv3mxKsYFxi/O3oP+ZTZjG3T7S9NpWXEHw/0szM7y/QHTRHUK8e94X FH6LevPiaze7VYiMGJqioZRnJz9BDLakbuIlKZMKD3mSZsLIFKaGMCr+io2OaekWnx/a H7mA8dbQ/JVQ8vSOugndemICEHF3Itvj8BYuU+5w9oyxJYBCCBI2RTmLoss5cB6jWN67 KHSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20260327; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=gPu400L5PT0BDkvaRrKV+INE7ZL1s6CCW7DCY3L/hXE=; fh=WpT6aB7RBAGHZeWZzqAr71yzRFbPTYkPWKsRagLn48Q=; b=KWvv5KNML1yf1N8YY+YSWWvW0GQIIkVgygLvhwMGphJDn2ql0kJ7zXrRecgsIqHtjh NQqUmQV6oPem38MK6exoEBWv7QcmvhzfPIOKQ249dg9ueFtc+XSN8uMpMHtmGEWOvGUB WDFNfaesx7STtN8tfcTuOMkYOwExTKEIbRcP9nXwP84BbCoMQAdn4w3kqfnIeOp8us5O nh+/XvfD7VwnIKvXTuzReh5xzVXb8cC9ZJNCYKYXtuOo7oVSJNHUhOxoCdX26zzMEExS U2ghBrAQZw/LxM9UnvN5gQ4grikJlAXgFhZ+7eOrNuUUDgQDAO1TTKjTykJ7LcLeG75X OaQg==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=LG28tTtC; spf=pass (google.com: domain of eva.kurchatova@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=eva.kurchatova@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com Received: from relay.virtuozzo.com (relay.virtuozzo.com. [130.117.225.111]) by mx.google.com with ESMTPS id ffacd0b85a97d-48e3ed33a28si21927784f8f.493.2026.10.27.08.52.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Oct 2026 08:52:42 -0700 (PDT) Received-SPF: pass (google.com: domain of eva.kurchatova@virtuozzo.com designates 130.117.225.111 as permitted sender) client-ip=130.117.225.111; Authentication-Results: mx.google.com; dkim=pass header.i=@virtuozzo.com header.s=relay header.b=LG28tTtC; spf=pass (google.com: domain of eva.kurchatova@virtuozzo.com designates 130.117.225.111 as permitted sender) smtp.mailfrom=eva.kurchatova@virtuozzo.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=virtuozzo.com DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuozzo.com; s=relay; h=MIME-Version:Message-ID:Date:Subject:From: Content-Type; bh=gPu400L5PT0BDkvaRrKV+INE7ZL1s6CCW7DCY3L/hXE=; b=LG28tTtCAfmf 5PxPWKqtTX0tF0b4hzy6K5M97mpUVrYpaUVS5o9vuVQI0XlPIDUsNjfhYJ9ql8GcS5H/mQ5Hbn4Ck hv4N5WHPv2wj2Ijhold/c0dsQVh7lpVGWzUw+T3tuoui2veVFumz9OoAKobeKd+Pn4GWxP4my5p0O c+7T8e6QYYUXarDJLZER2B8au65bd45IVcVCn4dGeafcnVnbw7jrVrQphMclZKjRZNubY75ERcruU i+boePIB3z1PW4pQks/Hz8KPR4kTCASKm+KoNzDSzf8RyZf5RB/6dMIaDVxTDM0/fmx/ffxfihsOr qHL8AHGsXnjKBVrtOsXxqg==; Received: from ch-vpn.virtuozzo.com ([130.117.225.6] helo=LekKit-T14) by relay.virtuozzo.com with esmtp (Exim 4.96) (envelope-from ) id 1xLjPt-00GIfe-1m; Tue, 27 Oct 2026 16:52:32 +0100 From: Eva Kurchatova To: khorenko@virtuozzo.com Date: Tue, 27 Oct 2026 17:51:30 +0200 Message-ID: <20261027155236.1226178-5-eva.kurchatova@virtuozzo.com> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261027155236.1226178-1-eva.kurchatova@virtuozzo.com> References: <20261027155236.1226178-1-eva.kurchatova@virtuozzo.com> MIME-Version: 1.0 X-OZ-Fwd: true Cc: devel@openvz.org Subject: [Devel] [PATCH hci-8.1 v2 4/7] selftests/zram: fail when a step fails X-BeenThere: devel@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: OpenVZ development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: devel-bounces@openvz.org Errors-To: devel-bounces@openvz.org The library prints FAIL for a step that fails and carries on, zram01 and zram02 print their verdict and exit 0 either way, and zram.sh exits with the status of zram02 alone, so no zram failure reached the runner. A step that reports FAIL now fails its test, and the suite takes the worst result of its two tests, a failure over a skip over a pass. https://virtuozzo.atlassian.net/browse/VSTOR-134205 Feature: fix selftests Signed-off-by: Eva Kurchatova --- tools/testing/selftests/zram/zram.sh | 11 +++++++++-- tools/testing/selftests/zram/zram01.sh | 4 ++++ tools/testing/selftests/zram/zram02.sh | 1 + tools/testing/selftests/zram/zram_lib.sh | 24 +++++++++++++++--------- 4 files changed, 29 insertions(+), 11 deletions(-) diff --git a/tools/testing/selftests/zram/zram.sh b/tools/testing/selftests/zram/zram.sh index b0b91d9b0dc2..56adeb17768f 100755 --- a/tools/testing/selftests/zram/zram.sh +++ b/tools/testing/selftests/zram/zram.sh @@ -4,15 +4,22 @@ TCID="zram.sh" . ./zram_lib.sh +# A failure outranks a skip, a skip outranks a pass +result () { + [ $1 -eq $ksft_skip ] && [ $ret -ne 0 ] || ret=$1 +} + run_zram () { echo "--------------------" echo "running zram tests" echo "--------------------" -./zram01.sh +./zram01.sh || result $? echo "" -./zram02.sh +./zram02.sh || result $? } check_prereqs +ret=0 run_zram +exit $ret diff --git a/tools/testing/selftests/zram/zram01.sh b/tools/testing/selftests/zram/zram01.sh index 8f4affe34f3e..8ab63c98c1af 100755 --- a/tools/testing/selftests/zram/zram01.sh +++ b/tools/testing/selftests/zram/zram01.sh @@ -33,6 +33,9 @@ zram_algs="lzo" zram_fill_fs() { + # An earlier step failed, and after a failed mount the directory + # would be filled on the host's filesystem + [ $ERR_CODE -ne 0 ] && return for i in $(seq $dev_start $dev_end); do echo "fill zram$i..." local b=0 @@ -70,6 +73,7 @@ zram_cleanup if [ $ERR_CODE -ne 0 ]; then echo "$TCID : [FAIL]" + exit 1 else echo "$TCID : [PASS]" fi diff --git a/tools/testing/selftests/zram/zram02.sh b/tools/testing/selftests/zram/zram02.sh index 2418b0c4ed13..54e17bbfdbb7 100755 --- a/tools/testing/selftests/zram/zram02.sh +++ b/tools/testing/selftests/zram/zram02.sh @@ -39,6 +39,7 @@ zram_cleanup if [ $ERR_CODE -ne 0 ]; then echo "$TCID : [FAIL]" + exit 1 else echo "$TCID : [PASS]" fi diff --git a/tools/testing/selftests/zram/zram_lib.sh b/tools/testing/selftests/zram/zram_lib.sh index 21ec1966de76..25e32cb956df 100755 --- a/tools/testing/selftests/zram/zram_lib.sh +++ b/tools/testing/selftests/zram/zram_lib.sh @@ -131,12 +131,14 @@ zram_max_streams() for max_s in $zram_max_streams; do local sys_path="/sys/block/zram${i}/max_comp_streams" echo $max_s > $sys_path || \ - echo "FAIL failed to set '$max_s' to $sys_path" + { echo "FAIL failed to set '$max_s' to $sys_path"; ERR_CODE=-1; } sleep 1 local max_streams=$(cat $sys_path) - [ "$max_s" -ne "$max_streams" ] && \ - echo "FAIL can't set max_streams '$max_s', get $max_stream" + if [ "$max_s" -ne "$max_streams" ]; then + echo "FAIL can't set max_streams '$max_s', get $max_streams" + ERR_CODE=-1 + fi i=$(($i + 1)) echo "$sys_path = '$max_streams'" @@ -156,7 +158,7 @@ zram_compress_alg() for alg in $zram_algs; do local sys_path="/sys/block/zram${i}/comp_algorithm" echo "$alg" > $sys_path || \ - echo "FAIL can't set '$alg' to $sys_path" + { echo "FAIL can't set '$alg' to $sys_path"; ERR_CODE=-1; } i=$(($i + 1)) echo "$sys_path = '$alg'" done @@ -171,7 +173,7 @@ zram_set_disksizes() for ds in $zram_sizes; do local sys_path="/sys/block/zram${i}/disksize" echo "$ds" > $sys_path || \ - echo "FAIL can't set '$ds' to $sys_path" + { echo "FAIL can't set '$ds' to $sys_path"; ERR_CODE=-1; } i=$(($i + 1)) echo "$sys_path = '$ds'" @@ -188,7 +190,7 @@ zram_set_memlimit() for ds in $zram_mem_limits; do local sys_path="/sys/block/zram${i}/mem_limit" echo "$ds" > $sys_path || \ - echo "FAIL can't set '$ds' to $sys_path" + { echo "FAIL can't set '$ds' to $sys_path"; ERR_CODE=-1; } i=$(($i + 1)) echo "$sys_path = '$ds'" @@ -205,13 +207,15 @@ zram_makeswap() mkswap /dev/zram$i > err.log 2>&1 if [ $? -ne 0 ]; then cat err.log - echo "FAIL mkswap /dev/zram$1 failed" + echo "FAIL mkswap /dev/zram$i failed" + ERR_CODE=-1 fi swapon /dev/zram$i > err.log 2>&1 if [ $? -ne 0 ]; then cat err.log - echo "FAIL swapon /dev/zram$1 failed" + echo "FAIL swapon /dev/zram$i failed" + ERR_CODE=-1 fi echo "done with /dev/zram$i" @@ -229,6 +233,7 @@ zram_swapoff() if [ $? -ne 0 ]; then cat err.log echo "FAIL swapoff /dev/zram$i failed" + ERR_CODE=-1 fi done dev_makeswap=-1 @@ -248,6 +253,7 @@ zram_makefs() if [ $? -ne 0 ]; then cat err.log echo "FAIL failed to make $fs on /dev/zram$i" + ERR_CODE=-1 fi i=$(($i + 1)) echo "zram mkfs.$fs: OK" @@ -261,7 +267,7 @@ zram_mount() echo "mount /dev/zram$i" mkdir zram$i mount /dev/zram$i zram$i > /dev/null || \ - echo "FAIL mount /dev/zram$i failed" + { echo "FAIL mount /dev/zram$i failed"; ERR_CODE=-1; } dev_mounted=$i done -- 2.56.0 _______________________________________________ Devel mailing list Devel@openvz.org https://lists.openvz.org/mailman/listinfo/devel