lkml.org 
[lkml]   [2012]   [Jan]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 11/20] ktest: Evaluate $KERNEL_VERSION in both install and post install
    From: Steven Rostedt <srostedt@redhat.com>

    The install process may also need to know what the kernel version
    is, to add it to the name. Evaluate it for both install and
    post install.

    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
    ---
    tools/testing/ktest/ktest.pl | 15 ++++++++++++---
    1 files changed, 12 insertions(+), 3 deletions(-)
    diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
    index 5d82c27..59738aa 100755
    --- a/tools/testing/ktest/ktest.pl
    +++ b/tools/testing/ktest/ktest.pl
    @@ -1434,12 +1434,19 @@ sub monitor {
    return 1;
    }

    +sub eval_kernel_version {
    + my ($option) = @_;
    +
    + $option =~ s/\$KERNEL_VERSION/$version/g;
    +
    + return $option;
    +}
    +
    sub do_post_install {

    return if (!defined($post_install));

    - my $cp_post_install = $post_install;
    - $cp_post_install =~ s/\$KERNEL_VERSION/$version/g;
    + my $cp_post_install = eval_kernel_version $post_install;
    run_command "$cp_post_install" or
    dodie "Failed to run post install";
    }
    @@ -1448,7 +1455,9 @@ sub install {

    return if ($no_install);

    - run_scp "$outputdir/$build_target", "$target_image" or
    + my $cp_target = eval_kernel_version $target_image;
    +
    + run_scp "$outputdir/$build_target", "$cp_target" or
    dodie "failed to copy image";

    my $install_mods = 0;
    --
    1.7.7.3

    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2012-01-05 04:55    [from the cache]
    ©2003-2011 Jasper Spaans