From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1mRMuO-0005j9-Qa for mharc-grub-devel@gnu.org; Fri, 17 Sep 2021 19:04:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59270) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mRMuM-0005dY-J0 for grub-devel@gnu.org; Fri, 17 Sep 2021 19:04:38 -0400 Received: from mail-io1-xd30.google.com ([2607:f8b0:4864:20::d30]:41976) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mRMuK-0005sX-VH for grub-devel@gnu.org; Fri, 17 Sep 2021 19:04:38 -0400 Received: by mail-io1-xd30.google.com with SMTP id j18so14051729ioj.8 for ; Fri, 17 Sep 2021 16:04:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=efficientek-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=J/LjX5HxeyJm8KPOp16//GXavL09xEk3ISNQNowqH6g=; b=wySrCxLn3An271Lq1Eh8zDrKNb2ovBbq3u7LoiVv9a1S1oscTgG2BmJWVs+fxpItWo EelWE+E+svWBtDMXha7+GDMTCusvFV4abfSHPNQP1Mf23L3piwONrH0RehY27SZ/Y0bB K4UHg/Nc8r8Zzd0ACod7LjXDZCibY3SSOGGBg9S8WxUAVbFqYPggUjzKMsQREz0y77vb duiIFrRa6unm8kwbrCiknMVzeDIJMmwHFjBCV9JcCQfuL42n1igHeB6faq3DhCc/WK3h RAQIWIOdS0V8pQLNwsR3JIa99OrXZFS08ZqyuuWjoY2dMAamYxH/fuWdPqkx4v2+2qYx IEOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=J/LjX5HxeyJm8KPOp16//GXavL09xEk3ISNQNowqH6g=; b=cdKqjD+lsmYzaIiNgQo6d6rqM5kFn3rA+FUhM8gAtnKebN0nzT8Mw0noDpTKx0nAUB ntjkPYZKWof6hEY4WdUhD0b78LHUVKHiRBTs+s2RfW0Z3ZroXuk1EUO54Ql3N4zqgPBz p+NcsGcuY5XJOnL+5DqcVX9N6aSjelsCCqdWQZbLPzkmvUbtGb4Qs3HkrmpJ+sma82zT yECQ2JaH5FGj4Em6L5A3h9LMy+fULXHXuNcrP44Bmy2h75m+iKdMd6HPddZsnag0NpZD S+3GeTf4s7yHRwOYRq9yanCjMWx9eA1k/NSC330IBBw/KVo1b9bq7J6Pnil1AdTQ9Yv5 SveQ== X-Gm-Message-State: AOAM533EmYV8erTORZ+FTotNeJWAIeUp1GnOIP6NWeB6uV00p+rzuMWo 9nlMw26k7kORGLSq1a7Ugc77XLoD11CbVA0w X-Google-Smtp-Source: ABdhPJxnGwqOevE6PGQoFmUsiJVGHrn04sP3ABIQycN5b76xv2ST37gfv9qjUA76gPhukKuRmYHSFg== X-Received: by 2002:a6b:5d0b:: with SMTP id r11mr1708476iob.92.1631919875775; Fri, 17 Sep 2021 16:04:35 -0700 (PDT) Received: from localhost.localdomain ([2806:103e:1d:2421:9e05:7c55:51:e84b]) by smtp.gmail.com with ESMTPSA id s7sm4218127ioc.42.2021.09.17.16.04.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Sep 2021 16:04:35 -0700 (PDT) From: Glenn Washburn To: grub-devel@gnu.org Cc: Glenn Washburn , Daniel Kiper Subject: [PATCH 05/10] tests: Only test minix3 volumes of 1k block size Date: Fri, 17 Sep 2021 23:03:59 +0000 Message-Id: <20210917230404.1587915-6-development@efficientek.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210917230404.1587915-1-development@efficientek.com> References: <20210917230404.1587915-1-development@efficientek.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::d30; envelope-from=development@efficientek.com; helo=mail-io1-xd30.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Sep 2021 23:04:38 -0000 Apparently there used to be a -B option for mkfs.minix to create a volume with a specified block size. This version is hard to come by and does not appear to be available in debian distributions. So remove support for testing a variety of blocks sizes for minix3. This allows the minix tests to run because they were being skipped due to not finding a mkfs.minix with the -B option. Signed-off-by: Glenn Washburn --- tests/minixfs_test.in | 5 ----- tests/util/grub-fs-tester.in | 4 ++-- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/tests/minixfs_test.in b/tests/minixfs_test.in index 3b16a4de0..437d92df6 100644 --- a/tests/minixfs_test.in +++ b/tests/minixfs_test.in @@ -25,11 +25,6 @@ if ! mkfs.minix -h | grep -- -3 > /dev/null; then exit 77 fi -if ! mkfs.minix -h | grep -- -B > /dev/null; then - echo "mkfs.minix doesn't support variable block size; cannot test minix*fs." - exit 77 -fi - "@builddir@/grub-fs-tester" minix "@builddir@/grub-fs-tester" minix2 "@builddir@/grub-fs-tester" minix3 diff --git a/tests/util/grub-fs-tester.in b/tests/util/grub-fs-tester.in index f4d9f161b..96b204590 100644 --- a/tests/util/grub-fs-tester.in +++ b/tests/util/grub-fs-tester.in @@ -201,7 +201,7 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do # OS LIMITATION: Linux rejects non-power-of-two blocks. # OS LIMITATION: Linux rejects > 4096. MINBLKSIZE=1024 - MAXBLKSIZE=4096;; + MAXBLKSIZE=1024;; esac if test "$BLKSTEP" -eq 0; then blksizes="$(powrange "$MINBLKSIZE" "$MAXBLKSIZE")" @@ -697,7 +697,7 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do "mkfs.minix" -v "${MOUNTDEVICE}" MOUNTFS="minix";; x"minix3") - "mkfs.minix" -B $BLKSIZE -3 "${MOUNTDEVICE}" + "mkfs.minix" -3 "${MOUNTDEVICE}" MOUNTFS="minix";; x"ntfs"*) "mkfs.ntfs" -s "$SECSIZE" -c "$BLKSIZE" -L "$FSLABEL" -Q -q "${MOUNTDEVICE}" -- 2.32.0