From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1nGpdA-0002jy-A6 for mharc-grub-devel@gnu.org; Sun, 06 Feb 2022 17:03:36 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59420) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nGpaO-0008SV-Pw for grub-devel@gnu.org; Sun, 06 Feb 2022 17:01:12 -0500 Received: from [2607:f8b0:4864:20::f2e] (port=38604 helo=mail-qv1-xf2e.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nGpaK-0000ih-AJ for grub-devel@gnu.org; Sun, 06 Feb 2022 17:00:42 -0500 Received: by mail-qv1-xf2e.google.com with SMTP id d3so4374332qvb.5 for ; Sun, 06 Feb 2022 14:00:39 -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=R5HAudOJNdByvx2jIS3EkgGLLoBjf7xEVNyOkugVS6Q=; b=Jelp9EmLLa+ocViIQr40OyeHDf9H+3r97UvHE8XekOQkxwggEHdz3VKhrhpePS1AES gYEnRGOlh1QMNQlANLidgMCN3vbrUYyoiG+cXoL4q+tXs5FKPCvzN4MFdcx4TZGBnHhJ U8j27PSM1eoOciQpeTAAcawEbMyTGr+SjHEF5451CxV/h/XyMIrl58CkEBDk+M/TBA6E f89CPcQzcGaklRshEGmkFx8r6E5BCo7/0dC9CKVTOQ6ejEoayneioFjeWFXyRJ0VFYoP Kug6znTy03PQr7HqQ+EhUDRqat8TEAMlpGfNSWn3pMDXCV66tPgXSxjf4AKlC5/PDd9i lZBw== 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=R5HAudOJNdByvx2jIS3EkgGLLoBjf7xEVNyOkugVS6Q=; b=wp0DV4W5eWpNh2FzvCk5ECK6CtMl4gj1dpQxlUX7IBte+e7rwo2w9DaD1FeLCAWqRx EPMdeTtIL2R7yGZ7qscuVShGxbnIO/D2SN7n55Nlk+qW6MJKXzpCa49fF6W8nUVMrbJD exr4R/2T/w6oc7Dwy4scZy+kGeHTOA0k5F0esU5xmlZdSug/OXq4AguNM/OmtCVwjWIJ 8to02mRc1MYKNG+XV1dE2i4W8y8HDtqEswZJeWSnh8Qq/7LPQVrdtkXPZeHjkw5MEqUH HVUIDvuCwHjBfXybYE3p3/oVtIXD2SVpfRVeDMhXmfyrkTLxQ6s/P4O0VaIae6iEMix+ gdfA== X-Gm-Message-State: AOAM532YKbtk+uCOSAlBJ+xQzudR/C3Z7raGJVqrsXehNNkbo/ePwnaJ VjVW5F6G9lvYC8nMB3eNhefvpw== X-Google-Smtp-Source: ABdhPJxEuZzezPBW729cUoYF4YXylZoe7SfFaIbfl2hS5FlvddXAHcS6K1tZJuYztnYmxRP8yXDAmg== X-Received: by 2002:a05:6214:ca5:: with SMTP id s5mr8792874qvs.35.1644184839203; Sun, 06 Feb 2022 14:00:39 -0800 (PST) Received: from localhost.localdomain (garza.riseup.net. [198.252.153.109]) by smtp.gmail.com with ESMTPSA id u17sm4664220qkp.90.2022.02.06.14.00.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Feb 2022 14:00:38 -0800 (PST) From: Glenn Washburn To: Daniel Kiper , grub-devel@gnu.org Cc: Glenn Washburn Subject: [PATCH v3 0/5] Various test fixes and improvements Date: Sun, 6 Feb 2022 16:00:07 -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::f2e (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::f2e; envelope-from=development@efficientek.com; helo=mail-qv1-xf2e.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 22:01:27 -0000 v3 - Fix botched v2 udate v2 - 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 against v2: 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: 8fb4d98fd 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 ++trap cleanup EXIT INT +# This is for bash, dash and ash do not recognize ERR -+trap umount_all ERR || : ++trap cleanup ERR || : + # This wrapper is to ease insertion of valgrind or time statistics run_it () { 5: 61bd6959b ! 5: 8b05a80a1 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 @@ tests/util/grub-fs-tester.in: tempdir=`mktemp -d "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX + done + return 0 } --trap umount_all EXIT INT -+trap cleanup EXIT INT + trap cleanup EXIT INT # This is for bash, dash and ash do not recognize ERR --trap umount_all ERR || : -+trap cleanup ERR || : - - # This wrapper is to ease insertion of valgrind or time statistics - run_it () { -- 2.27.0