From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1mImyG-0002xM-Vn for mharc-grub-devel@gnu.org; Wed, 25 Aug 2021 03:05:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54650) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mImy6-0002mC-RH for grub-devel@gnu.org; Wed, 25 Aug 2021 03:05:05 -0400 Received: from mail-qk1-x735.google.com ([2607:f8b0:4864:20::735]:36593) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mImy4-0002gG-On for grub-devel@gnu.org; Wed, 25 Aug 2021 03:05:02 -0400 Received: by mail-qk1-x735.google.com with SMTP id e14so26035442qkg.3 for ; Wed, 25 Aug 2021 00:05:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=efficientek-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=zwgXBwALTslsqpA+u21wBraltWGKLSJgUIupJto2UoE=; b=F+DGqbAUkdjBN/eaxzt/D/0s72WGE7kUhuqH8+M9VwjvCgT10782lgNV+y1l4t9OG9 aVB4l5guvLVEA72HdX2xcW2Hwh97u+ggt+XQQ6mCSGI0zu3fbJZjOZliuWym1eSi2PTP RZx2Uetq5iMgxq0HSDdHTdZrWLtk0GqIKMhRAk9aUBlog+L2mOa+pxqTI8Ep0JqB3QMJ KXoCEPgB1o7bZ9Tg+nahcw15XVAL7cWpHCrh/puGzyVOcjeVtR6ERMNuDKRVmlvq6eyG xVru/oa/h2XmiPIKX4n4hTZaGsVthvH69wg4yINvUfQ1lkaFBvK4Qvj1F+HORueOGUvt U1vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=zwgXBwALTslsqpA+u21wBraltWGKLSJgUIupJto2UoE=; b=VcQaWf3aBc538L5w2DvAbb1AsEUVjvIcljBHThKehzomTdHE46Dl9lmVFMi3rot/lp KFOgpl8oVyyefZEtFoloxQxQ3VVbEIbbnCMJrmkIx1uLiGsCDnBanjLi9m0HloR9gOSb GKa4mbD3mJol0bTiVOJeCxniB7OY+D9TUzEVcMbU5fTX9A2qkwgfHT6hkaSvS9Amcr6R Zp9RVGPXTRce4p2ClRnFC3kD1Ymh2jpVS3K9NxW5n9fKR0MXdnC2ALo0kJ4Z8r2WfyOz 4Nu7thFowejL8Pw1nDoJFbh6yBK+mPKXkeN0T6CBMiZzkfPlmQWXHZay9o27cjJ8Ymu+ vdaw== X-Gm-Message-State: AOAM532Ac3xZySebJVG1G8+wDQGP9Q4ySnrFgn37WQcyl653CVcfKdnG iPUZMdOMLsDc4D4Z2VgJ1x79Bo/hBAZJa4/d X-Google-Smtp-Source: ABdhPJzhFZ6LQsEGO2RXr9jVc3ab0z8pE4X1oEyFdBl5dYWSNXXZmQrWYlOsGc2d6hHdC76QFh/cXg== X-Received: by 2002:a37:7103:: with SMTP id m3mr30547440qkc.178.1629875099501; Wed, 25 Aug 2021 00:04:59 -0700 (PDT) Received: from localhost.localdomain ([199.58.83.11]) by smtp.gmail.com with ESMTPSA id g1sm12444585qkd.89.2021.08.25.00.04.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Aug 2021 00:04:59 -0700 (PDT) From: Glenn Washburn To: grub-devel@gnu.org, Daniel Kiper Cc: Glenn Washburn Subject: [PATCH v2 7/8] tests: Exit with skipped exit code when test not performed Date: Wed, 25 Aug 2021 02:04:01 -0500 Message-Id: <47afc3569a32b3890c3b80028ee1c67d29aaf2cc.1629874373.git.development@efficientek.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::735; envelope-from=development@efficientek.com; helo=mail-qk1-x735.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: Wed, 25 Aug 2021 07:05:06 -0000 These tests were not performed and therefore did not pass, nor fail. This fixes misleading test exit code where, for instance, the pseries_test will pass on i386-pc, which is not a pseries architecture. Signed-off-by: Glenn Washburn --- tests/ahci_test.in | 8 ++++---- tests/cdboot_test.in | 8 ++++---- tests/core_compress_test.in | 2 +- tests/ehci_test.in | 8 ++++---- tests/fddboot_test.in | 16 ++++++++-------- tests/grub_cmd_date.in | 2 +- tests/grub_cmd_set_date.in | 6 +++--- tests/hddboot_test.in | 6 +++--- tests/netboot_test.in | 12 ++++++------ tests/ohci_test.in | 8 ++++---- tests/partmap_test.in | 8 ++++---- tests/pata_test.in | 6 +++--- tests/pseries_test.in | 2 +- tests/uhci_test.in | 8 ++++---- 14 files changed, 50 insertions(+), 50 deletions(-) diff --git a/tests/ahci_test.in b/tests/ahci_test.in index a2bcff6b9..0e1c3679b 100644 --- a/tests/ahci_test.in +++ b/tests/ahci_test.in @@ -22,16 +22,16 @@ grubshell=@builddir@/grub-shell case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in # PLATFORM: Don't mess with real devices when OS is active *-emu) - exit 0;; + exit 77;; # FIXME: qemu gets bonito DMA wrong mipsel-loongson) - exit 0;; + exit 77;; # PLATFORM: no AHCI on ARC and qemu-mips platforms mips*-arc | mips*-qemu_mips) - exit 0;; + exit 77;; # FIXME: No native drivers are available for those powerpc-ieee1275 | sparc64-ieee1275 | arm*-efi) - exit 0;; + exit 77;; esac imgfile="`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"`" || exit 99 diff --git a/tests/cdboot_test.in b/tests/cdboot_test.in index 7229f79fb..c0a5212ff 100644 --- a/tests/cdboot_test.in +++ b/tests/cdboot_test.in @@ -22,16 +22,16 @@ grubshell=@builddir@/grub-shell case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in # PLATFORM: emu is different *-emu) - exit 0;; + exit 77;; # PLATFORM: Flash targets i386-qemu | i386-coreboot | mips-qemu_mips | mipsel-qemu_mips) - exit 0;; + exit 77;; # FIXME: currently grub-shell uses only -kernel for loongson mipsel-loongson) - exit 0;; + exit 77;; # FIXME: OFW fails to open CD-ROM i386-ieee1275) - exit 0;; + exit 77;; esac v=`echo hello | "${grubshell}" --boot=cd` diff --git a/tests/core_compress_test.in b/tests/core_compress_test.in index 90dd00607..72d2eca7d 100644 --- a/tests/core_compress_test.in +++ b/tests/core_compress_test.in @@ -22,7 +22,7 @@ grubshell=@builddir@/grub-shell case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in # FIXME: Only mips currently supports configurable core compression *-emu | i386-* | x86_64-* | sparc64-* | ia64-*) - exit 0 + exit 77 ;; esac diff --git a/tests/ehci_test.in b/tests/ehci_test.in index da7652bd3..bd80f93d4 100644 --- a/tests/ehci_test.in +++ b/tests/ehci_test.in @@ -22,16 +22,16 @@ grubshell=@builddir@/grub-shell case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in # PLATFORM: Don't mess with real devices when OS is active *-emu) - exit 0;; + exit 77;; # FIXME: qemu gets bonito DMA wrong mipsel-loongson) - exit 0;; + exit 77;; # PLATFORM: no USB on ARC and qemu-mips platforms mips*-arc | mips*-qemu_mips) - exit 0;; + exit 77;; # FIXME: No native drivers are available for those powerpc-ieee1275 | sparc64-ieee1275 | arm*-efi) - exit 0;; + exit 77;; esac imgfile="`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"`" || exit 99 diff --git a/tests/fddboot_test.in b/tests/fddboot_test.in index 1bbe60ee5..5348ac56b 100644 --- a/tests/fddboot_test.in +++ b/tests/fddboot_test.in @@ -22,28 +22,28 @@ grubshell=@builddir@/grub-shell case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in # PLATFORM: emu is different *-emu) - exit 0;; + exit 77;; # PLATFORM: Flash targets i386-qemu | i386-coreboot | mips-qemu_mips | mipsel-qemu_mips) - exit 0;; + exit 77;; # FIXME: currently grub-shell uses only -kernel for loongson mipsel-loongson) - exit 0;; + exit 77;; # FIXME: We don't support EFI floppy boot in grub-mkrescue *-efi) - exit 0;; + exit 77;; # FIXME: no floppy support i386-multiboot) - exit 0;; + exit 77;; # FIXME: QEMU firmware crashes when trying to boot from floppy sparc64-ieee1275) - exit 0;; + exit 77;; # FIXME: QEMU doesn't emulate SCSI floppies mipsel-arc | mips-arc) - exit 0;; + exit 77;; # PLATFORM: powerpc doesn't boot from floppy except OldWorld Macs which we don't support anyway powerpc-ieee1275) - exit 0;; + exit 77;; esac v=`echo hello | "${grubshell}" --boot=fd --mkrescue-arg="--compress=xz --fonts= --locales= --themes= -no-pad"` diff --git a/tests/grub_cmd_date.in b/tests/grub_cmd_date.in index f9156691e..409cb684a 100644 --- a/tests/grub_cmd_date.in +++ b/tests/grub_cmd_date.in @@ -5,7 +5,7 @@ set -e # FIXME: OpenBIOS on sparc64 doesn't implement RTC if [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = sparc64-ieee1275 ]; then - exit 0 + exit 77 fi pdt="$(date -u +%s)" diff --git a/tests/grub_cmd_set_date.in b/tests/grub_cmd_set_date.in index aac120a6c..17673cd8a 100644 --- a/tests/grub_cmd_set_date.in +++ b/tests/grub_cmd_set_date.in @@ -6,15 +6,15 @@ set -e case "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" in # FIXME: OpenBIOS on sparc64 doesn't implement RTC sparc64-ieee1275) - exit 0;; + exit 77;; # PLATFORM: ARC doesn't provide any way to set time *-arc) - exit 0;; + exit 77;; # PLATFORM: EMU doesn't provide any way to set time # Even if it did we'd need some kind of sandbox to avoid # modifying real system time. *-emu) - exit 0;; + exit 77;; esac out=$(cat <