First PowerPC specific changes (not templates)

* New OFW variable to identify Open Firmware (used by PowerPC)
* Few needles changes for PowerPC support
* as requested do not change the timers value below for PowerPC
  tests/install_source_graphical.pm (300 to 600)
  tests/_boot_to_anaconda.pm (300 to 1200)
  This will be handled by TIMEOUT_SCALE in templates

Signed-off-by: Guy Menanteau <menantea@linux.vnet.ibm.com>
This commit is contained in:
Guy Menanteau 2016-11-09 09:16:00 +01:00 committed by Michel Normand
parent 004121a38d
commit 06839422e5
10 changed files with 121 additions and 9 deletions

View File

@ -193,10 +193,11 @@ sub do_bootloader {
first => 1, first => 1,
timeout => 30, timeout => 30,
uefi => get_var("UEFI"), uefi => get_var("UEFI"),
ofw => get_var("OFW"),
@_ @_
); );
# if not postinstall and not UEFI, syslinux # if not postinstall not UEFI and not ofw, syslinux
$args{bootloader} //= ($args{uefi} || $args{postinstall}) ? "grub" : "syslinux"; $args{bootloader} //= ($args{uefi} || $args{postinstall} || $args{ofw}) ? "grub" : "syslinux";
if ($args{uefi}) { if ($args{uefi}) {
# we use the firmware-type specific tags because we want to be # we use the firmware-type specific tags because we want to be
# sure we actually did a UEFI boot # sure we actually did a UEFI boot
@ -229,7 +230,9 @@ sub do_bootloader {
} }
send_key "end"; send_key "end";
} }
type_string " $args{params}"; # Change type_string by type_safely because keyboard polling
# in SLOF usb-xhci driver failed sometimes in powerpc
type_safely " $args{params}";
} }
# ctrl-X boots from grub editor mode # ctrl-X boots from grub editor mode
send_key "ctrl-x"; send_key "ctrl-x";

View File

@ -0,0 +1,36 @@
{
"tags": [
"anaconda_main_hub_text"
],
"area": [
{
"xpos": 2,
"height": 10,
"width": 304,
"ypos": 562,
"type": "match"
},
{
"type": "match",
"ypos": 322,
"width": 127,
"xpos": 55,
"height": 13
},
{
"ypos": 417,
"width": 119,
"type": "match",
"xpos": 8,
"height": 13
},
{
"xpos": 584,
"ypos": 338,
"width": 10,
"height": 10,
"type": "match"
}
],
"properties": []
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.4 KiB

View File

@ -0,0 +1,22 @@
{
"properties": [],
"tags": [
"rescue_mounted"
],
"area": [
{
"xpos": 0,
"ypos": 594,
"width": 95,
"height": 12,
"type": "match"
},
{
"xpos": 56,
"ypos": 722,
"width": 103,
"height": 12,
"type": "match"
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.4 KiB

View File

@ -0,0 +1,25 @@
{
"tags": [
"ENV-DISTRI-fedora",
"ENV-FLAVOR-server",
"bootloader",
"bootloader_bios"
],
"properties": [],
"area": [
{
"xpos": 49,
"type": "match",
"ypos": 342,
"height": 10,
"width": 163
},
{
"ypos": 64,
"type": "match",
"xpos": 54,
"width": 54,
"height": 30
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.7 KiB

View File

@ -0,0 +1,18 @@
{
"tags": [
"ENV-DISTRI-fedora",
"ENV-FLAVOR-server",
"bootloader",
"bootloader_bios"
],
"properties": [],
"area": [
{
"xpos": 51,
"ypos": 343,
"width": 513,
"height": 10,
"type": "match"
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

View File

@ -5,6 +5,13 @@ use testapi;
sub run { sub run {
# handle bootloader screen # handle bootloader screen
assert_screen "bootloader", 30; assert_screen "bootloader", 30;
if (get_var('OFW')) {
# select "rescue system" directly
send_key "down";
send_key "down";
send_key "ret";
}
else {
# select troubleshooting # select troubleshooting
send_key "down"; send_key "down";
send_key "ret"; send_key "ret";
@ -16,6 +23,7 @@ sub run {
else { else {
type_string "r\n"; type_string "r\n";
} }
}
assert_screen "rescue_select", 120; # it takes time to start anaconda assert_screen "rescue_select", 120; # it takes time to start anaconda
# continue # continue