From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1nGcX5-000448-1B for mharc-grub-devel@gnu.org; Sun, 06 Feb 2022 03:04:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:32872) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nGcWx-000437-G2 for grub-devel@gnu.org; Sun, 06 Feb 2022 03:04:20 -0500 Received: from [2607:f8b0:4864:20::734] (port=43659 helo=mail-qk1-x734.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nGcWv-0008Gq-HD for grub-devel@gnu.org; Sun, 06 Feb 2022 03:04:19 -0500 Received: by mail-qk1-x734.google.com with SMTP id j24so8512248qkk.10 for ; Sun, 06 Feb 2022 00:04:16 -0800 (PST) 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:mime-version :content-transfer-encoding; bh=kYx/IJB6iDBn5eXuyKuX2tg5OLoQlRW3K7s2Fpn9MJY=; b=B47jamqusaZy6K1ReZShlRI9zA5lI9gGDbxrm58woBL+9cHvE3jDifNsVp9hDWmPQt YxXkhCHmz5wNUvTVtn24rY/4cLZwBmwlf5QkxkTEJku8yK/JCWKCuvoqH8deLakl2u3s nBlgkbJcyHK7vP0Za698YWai+LUEfoufsWnO6sVqTeVF0BmcteadGPlLYj/gVtqm9Z5G Vf9fSYi3kIGzFl1cXLShaL9lLwkrVP9KVeX1St2g5A1ACyoLsDrKFF8UdvsYKLzt9tzH hkdBrA+rRxEzcVDIsmFi8wzlaX7wp9cG9vuDfq3NgosY86w1mBvRLMcSM5zChDEhViyi bvow== 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:mime-version :content-transfer-encoding; bh=kYx/IJB6iDBn5eXuyKuX2tg5OLoQlRW3K7s2Fpn9MJY=; b=I/0zXOPGDa/rmet19xPVQZcwxQCR4ShwIyjqmCL6Kabie9q/tNwRzsRrVMzur7guWY sk4C24uIw7OA6DK6+duR0vxGyQdB75ClFpU4Gs8KI+qhonjocqyRuX7QRLTrSDf502BM hqhRFVIGGeRh8gRQAdR2SnDfygJRDn5Quxij9XGMF1Gkh5r88vzd5Q0OyvOXl66zkO60 mDED69JBf+n8sv58FapXJ14xJC10ZqfLEpnXWI+ZoOJYx8F+hIfEmFEYvEvIlqGKYT20 jF/gYvqKLZpHTn+ndsR2AsCJYTs0SG9PZA5ZGuk7Qd1YpH0RQunx/s8zFeY2xHqYr0n4 Q62w== X-Gm-Message-State: AOAM532vVk0VA0oaES9l+ebNoB/WtfK0i97yRvoCMCgLRBzUraaK2t4W g/mfrNdBDthBIWVpkgaUOK1PaQ== X-Google-Smtp-Source: ABdhPJxkV+I49aNSAAEXp3neSz03/jpqBYVi7mRy5EOCBclTHvACOXkFztyRpBE/vzfvTRN+NB7hmw== X-Received: by 2002:a05:620a:bc7:: with SMTP id s7mr3669603qki.265.1644134655592; Sun, 06 Feb 2022 00:04:15 -0800 (PST) Received: from localhost.localdomain (garza.riseup.net. [198.252.153.109]) by smtp.gmail.com with ESMTPSA id y2sm3549666qke.33.2022.02.06.00.04.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Feb 2022 00:04:15 -0800 (PST) From: Glenn Washburn To: Daniel Kiper , grub-devel@gnu.org Cc: Glenn Washburn Subject: [PATCH 0/5] Various test fixes and improvements Date: Sun, 6 Feb 2022 02:02:39 -0600 Message-Id: X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::734 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::734; envelope-from=development@efficientek.com; helo=mail-qk1-x734.google.com X-Spam_score_int: -10 X-Spam_score: -1.1 X-Spam_bar: - X-Spam_report: (-1.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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, 06 Feb 2022 08:04:22 -0000 Updated with Daniel's suggestions. Glenn Glenn Washburn (5): tests: Do not remove image file on error in pata_test tests: Skip pata_test on i386-efi tests: Remove $((BASE#NUM)) bashism in grub-fs-tester tests: Ensure that mountpoints are unmounted before exiting tests: Ensure that loopback devices and zfs devices are cleaned up tests/pata_test.in | 4 ++- tests/util/grub-fs-tester.in | 56 ++++++++++++++++++++++++++++++------ 2 files changed, 51 insertions(+), 9 deletions(-) Range-diff: 1: 24b2a4bfd = 1: 313168dd7 tests: Do not remove image file on error in pata_test 2: a64ebe41a = 2: 53df676e7 tests: Skip pata_test on i386-efi 3: d2248490b = 3: 401b227cb tests: Remove $((BASE#NUM)) bashism in grub-fs-tester 4: 410461b20 ! 4: 264f914b1 tests: Ensure that mountpoints are unmounted before exiting @@ tests/util/grub-fs-tester.in: tempdir=`mktemp -d "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX XORRISOFS_CHARSET="-input-charset UTF-8 -output-charset UTF-8" +MOUNTS= -+umount_all() { -+ for MOUNT in $MOUNTS; do -+ umount "$MOUNT" && -+ MOUNTS="$(echo ${MOUNTS} | sed "s|$MOUNT||g;")" ++cleanup() { ++ for i in $MOUNTS; do ++ umount "$i" || : + done +} +trap umount_all EXIT INT 5: 61bd6959b ! 5: eb4a20b84 tests: Ensure that loopback devices and zfs devices are cleaned up @@ tests/util/grub-fs-tester.in: tempdir=`mktemp -d "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX XORRISOFS_CHARSET="-input-charset UTF-8 -output-charset UTF-8" MOUNTS= --umount_all() { +LODEVICES= -+cleanup() { + cleanup() { + if [ -n "$fs" -a -z "${fs##*zfs*}" -a -n "$FSLABEL" ]; then + zpool list "$FSLABEL" 2>/dev/null && + while ! zpool export "$FSLABEL" ; do @@ tests/util/grub-fs-tester.in: tempdir=`mktemp -d "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX + done + fi + - for MOUNT in $MOUNTS; do - umount "$MOUNT" && - MOUNTS="$(echo ${MOUNTS} | sed "s|$MOUNT||g;")" + for i in $MOUNTS; do + umount "$i" || : done + + for lodev in $LODEVICES; do -- 2.27.0