Avoid ppc64le failure for new ext4 install test

Changes because ppc64le install has PReP partition.

Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
This commit is contained in:
Michel Normand 2020-12-03 13:00:52 +01:00
parent cc9be973cf
commit 81654736ae

View File

@ -4,12 +4,21 @@ use testapi;
sub run { sub run {
assert_screen "root_console"; assert_screen "root_console";
# check that there are two partitions my $count = 3;
validate_script_output 'fdisk -l | grep /dev/vda | wc -l', sub { $_ =~ m/3/ }; my $devroot = 'vda1';
# check that vda2 is a boot partition and that the fs is ext4 my $devboot = 'vda2';
validate_script_output 'mount | grep /dev/vda2', sub { $_ =~ m/on \/boot type ext4/ }; if (get_var('OFW')) {
# check that vda1 is a root partition and that the fs is ext4 $count = 4; # for PowerPC there is also a PreP partition.
validate_script_output 'mount | grep /dev/vda1', sub { $_ =~ m/on \/ type ext4/ }; $devroot = 'vda2';
$devboot = 'vda3';
}
# check number of partitions
script_run 'fdisk -l | grep /dev/vda'; # debug
validate_script_output 'fdisk -l | grep /dev/vda | wc -l', sub { $_ =~ m/$count/ };
# check mounted partitions are ext4 fs
script_run 'mount | grep /dev/vda'; # debug
validate_script_output "mount | grep /dev/$devboot", sub { $_ =~ m/on \/boot type ext4/ };
validate_script_output "mount | grep /dev/$devroot", sub { $_ =~ m/on \/ type ext4/ };
} }
sub test_flags { sub test_flags {