diff options
author | Steven Rostedt <srostedt@redhat.com> | 2011-12-22 11:25:46 -0500 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2011-12-22 21:59:33 -0500 |
commit | 2b29b2f8f869847d437b525d4cf027c09dc38286 (patch) | |
tree | fcc33fecf4d709cb5b02e26ebf74b0ea12a3bac7 /tools | |
parent | 165708b273f87ac52a4564b114a6c046e6b3a02d (diff) |
ktest: Evaluate $KERNEL_VERSION in both install and post install
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>
Diffstat (limited to 'tools')
-rwxr-xr-x | 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 5d82c275e9e6..59738aa6ca73 100755 --- a/tools/testing/ktest/ktest.pl +++ b/tools/testing/ktest/ktest.pl | |||
@@ -1434,12 +1434,19 @@ sub monitor { | |||
1434 | return 1; | 1434 | return 1; |
1435 | } | 1435 | } |
1436 | 1436 | ||
1437 | sub eval_kernel_version { | ||
1438 | my ($option) = @_; | ||
1439 | |||
1440 | $option =~ s/\$KERNEL_VERSION/$version/g; | ||
1441 | |||
1442 | return $option; | ||
1443 | } | ||
1444 | |||
1437 | sub do_post_install { | 1445 | sub do_post_install { |
1438 | 1446 | ||
1439 | return if (!defined($post_install)); | 1447 | return if (!defined($post_install)); |
1440 | 1448 | ||
1441 | my $cp_post_install = $post_install; | 1449 | my $cp_post_install = eval_kernel_version $post_install; |
1442 | $cp_post_install =~ s/\$KERNEL_VERSION/$version/g; | ||
1443 | run_command "$cp_post_install" or | 1450 | run_command "$cp_post_install" or |
1444 | dodie "Failed to run post install"; | 1451 | dodie "Failed to run post install"; |
1445 | } | 1452 | } |
@@ -1448,7 +1455,9 @@ sub install { | |||
1448 | 1455 | ||
1449 | return if ($no_install); | 1456 | return if ($no_install); |
1450 | 1457 | ||
1451 | run_scp "$outputdir/$build_target", "$target_image" or | 1458 | my $cp_target = eval_kernel_version $target_image; |
1459 | |||
1460 | run_scp "$outputdir/$build_target", "$cp_target" or | ||
1452 | dodie "failed to copy image"; | 1461 | dodie "failed to copy image"; |
1453 | 1462 | ||
1454 | my $install_mods = 0; | 1463 | my $install_mods = 0; |