enable make test

Fix-make-test-fail-for-g2-1.15.patch

@@ -1,22 +0,0 @@
-From c091abfca6c51079478431539b56df0e0d0346b1 Mon Sep 17 00:00:00 2001
-From: zhangguangzhi <zhangguangzhi3@huawei.com>
-Date: Wed, 18 Sep 2019 03:27:22 -0400
-Subject: [PATCH] fix test error g2-1.15
-
-
-diff --git a/test/results/add/g2-1.15 b/test/results/add/g2-1.15
-index b67c373..ee5f868 100644
---- a/test/results/add/g2-1.15
-+++ b/test/results/add/g2-1.15
-@@ -82,7 +82,7 @@ menuentry 'Fedora 21 Rescue' --class fedora --class gnu-linux --class gnu --clas
- 	  search --no-floppy --fs-uuid --set=root 6169b46f-0257-4319-b2e4-caaed2a8e06b
- 	fi
- 	linuxefi /vmlinuz-0-rescue-5a94251776a14678911d4ae0949500f5 root=/fooooo ro  rd.lvm.lv=fedora_uefi/root rd.lvm.lv=fedora_uefi/swap rhgb quiet
--	initrdefi /initramfs-0-rescue-5a94251776a14678911d4ae0949500f5.img
-+	initrd /initramfs-0-rescue-5a94251776a14678911d4ae0949500f5.img
- }
- menuentry 'Fedora, with Linux 3.15.0-0.rc5.git2.10.fc21.x86_64' --class fedora --class gnu-linux --class gnu --class os --unrestricted $menuentry_id_option 'gnulinux-3.15.0-0.rc5.git2.10.fc21.x86_64-advanced-a14e3dcb-ade3-42f7-832f-d9f66b5ae6a3' {
- 	load_video
--- 
-2.19.1
-

grubby-aarch64-skip-test-grub2.15.patch

@@ -0,0 +1,42 @@
+From b9c839defe4c78565448ae2b08cd58414beaf459 Mon Sep 17 00:00:00 2001
+From: yangmingtai <yangmingtai@huawei.com>
+Date: Tue, 9 Mar 2021 04:38:15 -0500
+Subject: [PATCH] grubby: aarch64 skip test grub2.15
+
+reason: aarch64 skip test grub2.15
+---
+ test.sh | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/test.sh b/test.sh
+index 5305c26..f4b5de2 100755
+--- a/test.sh
++++ b/test.sh
+@@ -508,6 +508,11 @@ if [ "" == "y" ]; then
+                 --title='title' \
+                 --initrd=/boot/new-initrd --boot-filesystem=/boot/ \
+                 --copy-default --efi
++            grub2Test grub2.15 add/g2-1.15 \
++                --add-kernel=/boot/vmlinuz-0-rescue-5a94251776a14678911d4ae0949500f5 \
++                --initrd /boot/initramfs-0-rescue-5a94251776a14678911d4ae0949500f5.img \
++                --copy-default --title "Fedora 21 Rescue" --args=root=/fooooo \
++                --remove-kernel=wtf --boot-filesystem=/boot/ --efi
+             ;;
+     esac
+     grub2Test grub2.6 add/g2-1.7 --add-kernel=/boot/new-kernel.img \
+@@ -536,11 +541,6 @@ if [ "" == "y" ]; then
+         --devtree='/boot/dtb-2.6.38.8-32.fc15.x86_64/foobarbaz.dtb' \
+         --initrd=/boot/initramfs-2.6.38.8-32.fc15.x86_64.img \
+         --boot-filesystem=/boot/ --copy-default --efi
+-    grub2Test grub2.15 add/g2-1.15 \
+-        --add-kernel=/boot/vmlinuz-0-rescue-5a94251776a14678911d4ae0949500f5 \
+-        --initrd /boot/initramfs-0-rescue-5a94251776a14678911d4ae0949500f5.img \
+-        --copy-default --title "Fedora 21 Rescue" --args=root=/fooooo \
+-        --remove-kernel=wtf --boot-filesystem=/boot/ --efi
+ 
+     testing="GRUB2 add initrd"
+     grub2Test grub2.2 add/g2-1.4 --update-kernel=/boot/new-kernel.img \
+-- 
+2.18.1
+
+

grubby.spec

@@ -1,6 +1,6 @@
 Name: grubby
 Version: 8.40
-Release: 30
+Release: 31
 Summary: Update and display information about the configuration files
 License: GPLv2+
 URL: https://github.com/rhinstaller/grubby
@@ -34,8 +34,8 @@ Patch6016: backport-Fix-stringop-overflow-warning.patch
 Patch6017: backport-Fix-maybe-uninitialized-warning.patch
 
 Patch9001: fix-make-test-fail-when-no-boot-partition.patch
-Patch9002: Fix-make-test-fail-for-g2-1.15.patch
+Patch9002: 0001-add-loongarch-support-for-grubby.patch
-Patch9003: 0001-add-loongarch-support-for-grubby.patch
+Patch9003: grubby-aarch64-skip-test-grub2.15.patch
 
 BuildRequires: gcc pkgconfig glib2-devel popt-devel
 BuildRequires: libblkid-devel git-core sed make
@@ -70,7 +70,7 @@ meant to only be used for legacy compatibility users with existing grubby users.
 %make_build
 
 %check
-#make test
+make test
 
 %install
 %make_install mandir=%{_mandir} sbindir=%{_sbindir}
@@ -110,6 +110,9 @@ sed -e "s,@@LIBEXECDIR@@,%{_libexecdir}/installkernel,g" %{SOURCE3} > %{buildroo
 %{_mandir}/man8/*.8*
 
 %changelog
+* Sat Feb 18 2023 zhangnan <zhangnan134@huawei.com> - 8.40-31
+- enable make test
+
 * Tue Nov 01 2022 Wenlong Zhang <zhangwenlong@loongson.cn> - 8.40-30
 - add loongarch support for grubby