From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1mYa5l-0000sV-Fp for mharc-grub-devel@gnu.org; Thu, 07 Oct 2021 16:34:13 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37670) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mYa5j-0000nF-P1 for grub-devel@gnu.org; Thu, 07 Oct 2021 16:34:11 -0400 Received: from mail-qv1-xf35.google.com ([2607:f8b0:4864:20::f35]:36838) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mYa5f-0003bO-S5 for grub-devel@gnu.org; Thu, 07 Oct 2021 16:34:11 -0400 Received: by mail-qv1-xf35.google.com with SMTP id jo30so5039743qvb.3 for ; Thu, 07 Oct 2021 13:34:07 -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=ZxzKBDq/jbUmAv0abztNARQCSpCqLnDAacAg7nKeJio=; b=K/GUmHSPVSyoXUS+x2ES6lD6sBf20EEfq9dxqS5wOQIhSIqOS4w0m3a2TBua+2SF/z qEoNt/GbHGT+/yhEDgTLefSPVJoanU8Lt/t4Pk48CuYC4j2RXEGxoITJrjzzyLALpqKP vJDIeLQf4thkR9YKaDKDsLEsLawIPm8Eb/CDJPmjofq3CjaAIIObobpnJQN/O3VLsDBc KzmBzO+Gr1BQuApXuBt+Dl7ZG1bclNAVofGLYxymAC7bL4EBNkJ513xb92GQhSGD4uTc 6DItD+6TG1U+O5y3jcOxfltvZ1wj/KnZsR5enZWw0YK621a9DqbPXQipOIOfFoUGEcxE y8ow== 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=ZxzKBDq/jbUmAv0abztNARQCSpCqLnDAacAg7nKeJio=; b=tZejKYqJeG8a4aap9gQIxYZGtJPN9SjsBMO2HfBHuBQlzlAfZvFUJEg7cY0Z+NnMJN STQ7FZsg7WRxQZsQc+uhLA0yiJU3extWQoHErBYoSHnfa3ckZp2n3ppUchmj7uNZArD3 toY85GetqRtmR0VOqRCAdcXTQMOK7kF0bZsMRQMQZX0e8UV0LuZ8ttPFR0iEuxOgg8dt GmsY7o3hZ3bHmjzKbpt5swd6vpsL1w5s8DIkHMtwjwtFUI0h+rJJ1/1G2BwQhqz3XQEw eJPU8FM7l/Z+dFAbpKeoF4a+zNv9+hfbkM8STYn86jOUJs9a5z7vklEGhP3vBHd5YRRH +KOA== X-Gm-Message-State: AOAM533xwV9iLjA6lnHr0QDggRzj02h2R0TfE+SpiDr1mbhVHpFwe1yt X/Prx5keyW7kwep9gD+EnGnER/scLOJv4g== X-Google-Smtp-Source: ABdhPJzmlWtM86d5vgzb4nFFjEsrPeVUZLJWjZn0keKI8owZNZzGqS80ns7OFaMQl1wj4jgpJAnY+g== X-Received: by 2002:a05:6214:2026:: with SMTP id 6mr6129656qvf.61.1633638846689; Thu, 07 Oct 2021 13:34:06 -0700 (PDT) Received: from localhost.localdomain ([37.218.244.251]) by smtp.gmail.com with ESMTPSA id p187sm374106qkd.101.2021.10.07.13.34.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Oct 2021 13:34:06 -0700 (PDT) From: Glenn Washburn To: grub-devel@gnu.org, Daniel Kiper Cc: Glenn Washburn Subject: [PATCH v3 4/4] tests: Exit with skipped exit code when test not performed Date: Thu, 7 Oct 2021 15:33:27 -0500 Message-Id: <20211007203327.159098-5-development@efficientek.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20211007203327.159098-1-development@efficientek.com> References: <20211007203327.159098-1-development@efficientek.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::f35; envelope-from=development@efficientek.com; helo=mail-qv1-xf35.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: Thu, 07 Oct 2021 20:34:12 -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/grub_cmd_sleep.in | 2 +- 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 ++++---- 15 files changed, 51 insertions(+), 51 deletions(-) diff --git a/tests/ahci_test.in b/tests/ahci_test.in index 3f7645ad8..6d2e61d4e 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 df408d77a..df671b4b6 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 <