Skip to content

Commit

Permalink
Add s390/s390x --info test (#1285601)
Browse files Browse the repository at this point in the history
Running the --info grubby option on s390/s390x platforms always returned
the (null) value. Added a test to look at --info and ensure it comes out
as a user would expect.

Resolves: rhbz#1285601
  • Loading branch information
kellinm committed Mar 15, 2017
1 parent ef03c55 commit 00b4ad7
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 0 deletions.
2 changes: 2 additions & 0 deletions test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,8 @@ testing="Z/IPL display default title"
ziplDisplayTest zipl.1 defaulttitle/z.1 --default-title
testing="Z/IPL display default kernel"
ziplDisplayTest zipl.1 defaultkernel/z.1 --default-kernel
testing="Z/IPL display entry information"
ziplDisplayTest zipl.2 info/z2.1 --info=1

testing="GRUB fallback directive"
grubTest grub.5 fallback/g5.1 --remove-kernel=/boot/vmlinuz-2.4.7-ac3 \
Expand Down
6 changes: 6 additions & 0 deletions test/results/info/z2.1
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
index=1
kernel=/boot/vmlinuz-3.10.0-514.6.2.el7.s390x
args="crashkernel=auto rd.dasd=0.0.0120 rd.dasd=0.0.0121 rd.dasd=0.0.0122 rd.dasd=0.0.0123 rd.lvm.lv=rhel_ibm-z-68/root rd.lvm.lv=rhel_ibm-z-68/swap rd.znet=qeth,0.0.8000,0.0.8001,0.0.8002,layer2=1,portname=z-68,portno=0 LANG=en_US.UTF-8 systemd.log_level=debug systemd.log_target=kmsg"
root=/dev/mapper/rhel_ibm--z--68-root
initrd=/boot/initramfs-3.10.0-514.6.2.el7.s390x.img
title=3.10.0-514.6.2.el7.s390x_with_debugging
22 changes: 22 additions & 0 deletions test/zipl.2
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
[defaultboot]
defaultauto
prompt=1
timeout=5
default=3.10.0-514.6.2.el7.s390x_with_debugging
target=/boot
[3.10.0-514.6.2.el7.s390x]
image=/boot/vmlinuz-3.10.0-514.6.2.el7.s390x
parameters="root=/dev/mapper/rhel_ibm--z--68-root crashkernel=auto rd.dasd=0.0.0120 rd.dasd=0.0.0121 rd.dasd=0.0.0122 rd.dasd=0.0.0123 rd.lvm.lv=rhel_ibm-z-68/root rd.lvm.lv=rhel_ibm-z-68/swap rd.znet=qeth,0.0.8000,0.0.8001,0.0.8002,layer2=1,portname=z-68,portno=0 LANG=en_US.UTF-8"
ramdisk=/boot/initramfs-3.10.0-514.6.2.el7.s390x.img
[3.10.0-514.6.2.el7.s390x_with_debugging]
image=/boot/vmlinuz-3.10.0-514.6.2.el7.s390x
parameters="root=/dev/mapper/rhel_ibm--z--68-root crashkernel=auto rd.dasd=0.0.0120 rd.dasd=0.0.0121 rd.dasd=0.0.0122 rd.dasd=0.0.0123 rd.lvm.lv=rhel_ibm-z-68/root rd.lvm.lv=rhel_ibm-z-68/swap rd.znet=qeth,0.0.8000,0.0.8001,0.0.8002,layer2=1,portname=z-68,portno=0 LANG=en_US.UTF-8 systemd.log_level=debug systemd.log_target=kmsg"
ramdisk=/boot/initramfs-3.10.0-514.6.2.el7.s390x.img
[linux]
image=/boot/vmlinuz-3.10.0-514.el7.s390x
ramdisk=/boot/initramfs-3.10.0-514.el7.s390x.img
parameters="root=/dev/mapper/rhel_ibm--z--68-root crashkernel=auto rd.dasd=0.0.0120 rd.dasd=0.0.0121 rd.dasd=0.0.0122 rd.dasd=0.0.0123 rd.lvm.lv=rhel_ibm-z-68/root rd.lvm.lv=rhel_ibm-z-68/swap rd.znet=qeth,0.0.8000,0.0.8001,0.0.8002,layer2=1,portname=z-68,portno=0 LANG=en_US.UTF-8"
[linux-0-rescue-196fd0394b7442a6838686745f03fd04]
image=/boot/vmlinuz-0-rescue-196fd0394b7442a6838686745f03fd04
ramdisk=/boot/initramfs-0-rescue-196fd0394b7442a6838686745f03fd04.img
parameters="root=/dev/mapper/rhel_ibm--z--68-root crashkernel=auto rd.dasd=0.0.0120 rd.dasd=0.0.0121 rd.dasd=0.0.0122 rd.dasd=0.0.0123 rd.lvm.lv=rhel_ibm-z-68/root rd.lvm.lv=rhel_ibm-z-68/swap rd.znet=qeth,0.0.8000,0.0.8001,0.0.8002,layer2=1,portname=z-68,portno=0"

0 comments on commit 00b4ad7

Please sign in to comment.