From 81654736ae85aa679f0d8d48a857b8fc1c2c87a7 Mon Sep 17 00:00:00 2001 From: Michel Normand Date: Thu, 3 Dec 2020 13:00:52 +0100 Subject: [PATCH] Avoid ppc64le failure for new ext4 install test Changes because ppc64le install has PReP partition. Signed-off-by: Michel Normand --- ...tom_standard_partition_ext4_postinstall.pm | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/tests/disk_custom_standard_partition_ext4_postinstall.pm b/tests/disk_custom_standard_partition_ext4_postinstall.pm index 8ba6eb8e..03c1c598 100644 --- a/tests/disk_custom_standard_partition_ext4_postinstall.pm +++ b/tests/disk_custom_standard_partition_ext4_postinstall.pm @@ -4,12 +4,21 @@ use testapi; sub run { assert_screen "root_console"; - # check that there are two partitions - validate_script_output 'fdisk -l | grep /dev/vda | wc -l', sub { $_ =~ m/3/ }; - # check that vda2 is a boot partition and that the fs is ext4 - validate_script_output 'mount | grep /dev/vda2', sub { $_ =~ m/on \/boot type ext4/ }; - # check that vda1 is a root partition and that the fs is ext4 - validate_script_output 'mount | grep /dev/vda1', sub { $_ =~ m/on \/ type ext4/ }; + my $count = 3; + my $devroot = 'vda1'; + my $devboot = 'vda2'; + if (get_var('OFW')) { + $count = 4; # for PowerPC there is also a PreP partition. + $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 {