UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ktest: Allow tests to use different GRUB_MENUs 

To save connecting and searching for a given grub menu for each test,
ktest.pl will cache the grub number it found. The problem is that
different tests might use a different grub menu, but ktest.pl will
ignore it.

Instead, have ktest.pl check if the grub menu it used to cache the
content is the same as when it grabbed the menu. If not, grab it again,
otherwise just return the cached value.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
Steven Rostedt (Red Hat) 2013-03-08 09:33:35 -05:00 committed by Steven Rostedt
parent 6dbe51c251
commit 752d96657c
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/testing/ktest/ktest.pl
View File

@ -108,6 +108,7 @@ my $scp_to_target;
my $scp_to_target_install;
my $power_off;
my $grub_menu;
my $last_grub_menu;
my $grub_file;
my $grub_number;
my $grub_reboot;
@ -1538,7 +1539,8 @@ sub run_scp_mod {
sub get_grub2_index {
return if (defined($grub_number));
return if (defined($grub_number) && defined($last_grub_menu) &&
$last_grub_menu eq $grub_menu);
doprint "Find grub2 menu ... ";
$grub_number = -1;
@ -1565,6 +1567,7 @@ sub get_grub2_index {
die "Could not find '$grub_menu' in $grub_file on $machine"
if (!$found);
doprint "$grub_number\n";
$last_grub_menu = $grub_menu;
}
sub get_grub_index {
@ -1577,7 +1580,8 @@ sub get_grub_index {
if ($reboot_type ne "grub") {
return;
}
return if (defined($grub_number));
return if (defined($grub_number) && defined($last_grub_menu) &&
$last_grub_menu eq $grub_menu);
doprint "Find grub menu ... ";
$grub_number = -1;
@ -1604,6 +1608,7 @@ sub get_grub_index {
die "Could not find '$grub_menu' in /boot/grub/menu on $machine"
if (!$found);
doprint "$grub_number\n";
$last_grub_menu = $grub_menu;
}
sub wait_for_input