lkml.org 
[lkml]   [2013]   [Apr]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 2/2] ktest: Reset grub menu cache with different machines
    From: "Steven Rostedt (Red Hat)" <rostedt@goodmis.org>

    Different tests may use a different machine. In such cases, we need to
    try to get the current grub menu index. If the same grub menu is used
    for two different machines, it may not be at the same index on the
    second machine. A search for the index must be performed again.

    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
    ---
    tools/testing/ktest/ktest.pl | 9 +++++++--
    1 file changed, 7 insertions(+), 2 deletions(-)

    diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
    index 7958cd4..0d7fd8b 100755
    --- a/tools/testing/ktest/ktest.pl
    +++ b/tools/testing/ktest/ktest.pl
    @@ -73,6 +73,7 @@ my $ktest_config;
    my $version;
    my $have_version = 0;
    my $machine;
    +my $last_machine;
    my $ssh_user;
    my $tmpdir;
    my $builddir;
    @@ -1540,7 +1541,8 @@ sub run_scp_mod {
    sub get_grub2_index {

    return if (defined($grub_number) && defined($last_grub_menu) &&
    - $last_grub_menu eq $grub_menu);
    + $last_grub_menu eq $grub_menu && defined($last_machine) &&
    + $last_machine eq $machine);

    doprint "Find grub2 menu ... ";
    $grub_number = -1;
    @@ -1568,6 +1570,7 @@ sub get_grub2_index {
    if (!$found);
    doprint "$grub_number\n";
    $last_grub_menu = $grub_menu;
    + $last_machine = $machine;
    }

    sub get_grub_index {
    @@ -1581,7 +1584,8 @@ sub get_grub_index {
    return;
    }
    return if (defined($grub_number) && defined($last_grub_menu) &&
    - $last_grub_menu eq $grub_menu);
    + $last_grub_menu eq $grub_menu && defined($last_machine) &&
    + $last_machine eq $machine);

    doprint "Find grub menu ... ";
    $grub_number = -1;
    @@ -1609,6 +1613,7 @@ sub get_grub_index {
    if (!$found);
    doprint "$grub_number\n";
    $last_grub_menu = $grub_menu;
    + $last_machine = $machine;
    }

    sub wait_for_input
    --
    1.7.10.4

    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2013-04-29 16:01    [W:3.554 / U:0.556 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site