From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1py3jO-0006PM-BE for mharc-grub-devel@gnu.org; Sun, 14 May 2023 00:53:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1py3jL-0006P4-Aq for grub-devel@gnu.org; Sun, 14 May 2023 00:53:11 -0400 Received: from mail-qt1-x834.google.com ([2607:f8b0:4864:20::834]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1py3jJ-00055u-Jy for grub-devel@gnu.org; Sun, 14 May 2023 00:53:11 -0400 Received: by mail-qt1-x834.google.com with SMTP id d75a77b69052e-3f38b7ca98aso70750011cf.1 for ; Sat, 13 May 2023 21:53:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=efficientek-com.20221208.gappssmtp.com; s=20221208; t=1684039987; x=1686631987; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=JcVh5uXmFnQHHQ2vavWpFBwS/tNFs+MKRPp/7JnTOYI=; b=cxGktEFfnJ9RzqOxZomQDQmVK238WD+lefGptBKmkmUpGX/5oiPVhd21dg9NHMxG4F MyQ7xdJS641Rk3TR3FUon5ANNtf7PUH38K1pkyAzAbKUOgrw0nrlevpduB5/DZDXfO/N 1ZS/4mZmpWB1pMZJNrHZi/IWUd8fZQ19/olmUUxcuPnP0L/KgJqfHW/OqRrdHVNCjZ/g EYZkIvdodP3VQv2Z0/xqPXfjoz49Z3ModzITx/spMBxR2pblq0VDd4sowaMJjXkNAzGZ PJ+JWE+w+19WL5syrtAFK0lGDAu0JbAKpxGy5lkKNrukQj0afMvzjajuzcDEwJd7OXDA 3viA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684039987; x=1686631987; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=JcVh5uXmFnQHHQ2vavWpFBwS/tNFs+MKRPp/7JnTOYI=; b=bZOCDwXYTyi4IsYDD3OFH0ECBrhS0qzPWH2mvSDsxUdJDGCK/I0GFVdoAV4wul3OgL m3YKs9gOSfe8hbnvALNCBMoVT45+tGgxSc4AG5Wz/Lfk/dhKD8FkoVFs+Q3cBzbQWrfs mCERjd08kyOcDmuDhNUFrXWLPIO1zDQNnh2D6xSGhxWLG4jou7KdlUHgh0Gh/wb4IdYR xqe04QnVwrWnINFw2A6E7X8FsXzDEEKTLVFfV7hnqXofdo7vJA/kzXpfFV/5jHgFwECk WGTcfni4VeGzE1TTriqVDfuns7AYyjaQm32JDpSz/wvHDN5BzMUqveiWYj1ykVhlKDBm YKxA== X-Gm-Message-State: AC+VfDxSt8LixCgYs78qPpvUc7bzmvnFI27+uAXW4cWUP3KhYNXSc0Ke BxbLjqqF8s9/gseSfuK9fn+MwaBf6Wm81d/GJFg= X-Google-Smtp-Source: ACHHUZ784jIeoXzhw7p4yHNo1S+xG7FywhDXdBeqxygThWB9CNcyIk0TklAI1wRDTLsDUlNKkKoESw== X-Received: by 2002:a05:622a:2ca:b0:3ef:3bad:6d24 with SMTP id a10-20020a05622a02ca00b003ef3bad6d24mr49572404qtx.47.1684039987196; Sat, 13 May 2023 21:53:07 -0700 (PDT) Received: from localhost.localdomain ([199.58.83.10]) by smtp.gmail.com with ESMTPSA id j4-20020ac84c84000000b003e3860f12f7sm4374517qtv.56.2023.05.13.21.53.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 May 2023 21:53:06 -0700 (PDT) From: Glenn Washburn To: grub-devel@gnu.org, Daniel Kiper Cc: Glenn Washburn Subject: [PATCH] tests/util/grub-fs-tester: Avoid failing some file system tests due to file system filling up Date: Sat, 13 May 2023 23:52:56 -0500 Message-Id: <20230514045256.230572-1-development@efficientek.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::834; envelope-from=development@efficientek.com; helo=mail-qt1-x834.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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 May 2023 04:53:12 -0000 On some systems /usr/share/dict/american-english can be larger than the available space on the filesystem being tested (eg. vfat12a). This causes a failure of the filesystem test and is not a real test failure. Instead, use dd to copy at most 1M of data to the filesystem, which is enough for our purposes and will not fill any of the tested filesystems. Signed-off-by: Glenn Washburn --- tests/util/grub-fs-tester.in | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/tests/util/grub-fs-tester.in b/tests/util/grub-fs-tester.in index 9cc6b581197b..a235ff9cda29 100644 --- a/tests/util/grub-fs-tester.in +++ b/tests/util/grub-fs-tester.in @@ -1058,15 +1058,7 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do if [ x$CASESENS = xy ]; then "$builddir"/garbage-gen $BLOCKCNT > "$MNTPOINTRW/$OSDIR/cAsE" fi - if (test x$fs = xvfat12a || test x$fs = xmsdos12a) && test x$BLKSIZE = x131072; then - # With this config there isn't enough space for full copy. - # Copy as much as we can - cp "${CFILESRC}" "$MNTPOINTRW/$OSDIR/${CFILE}" &> /dev/null; - else - - cp "${CFILESRC}" "$MNTPOINTRW/$OSDIR/${CFILE}"; - - fi + dd if="${CFILESRC}" of="$MNTPOINTRW/$OSDIR/${CFILE}" bs=1024 count=1024 if [ x$NOSYMLINK != xy ]; then ln -s "$BASEFILE" "$MNTPOINTRW/$OSDIR/$BASESYM" -- 2.34.1