Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 319796
b: refs/heads/master
c: e5c2ec1
h: refs/heads/master
v: v3
  • Loading branch information
Steven Rostedt authored and Steven Rostedt committed Jul 19, 2012
1 parent 334c33a commit e23a003
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 921ed4c7208e5c466a87db0a11c6fdd26bcc2fe7
refs/heads/master: e5c2ec11a07b9e1e7eb714aad13583e2bbae49bd
8 changes: 8 additions & 0 deletions trunk/tools/testing/ktest/ktest.pl
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@
my $grub_number;
my $target;
my $make;
my $pre_install;
my $post_install;
my $no_install;
my $noclean;
Expand Down Expand Up @@ -225,6 +226,7 @@
"ADD_CONFIG" => \$addconfig,
"REBOOT_TYPE" => \$reboot_type,
"GRUB_MENU" => \$grub_menu,
"PRE_INSTALL" => \$pre_install,
"POST_INSTALL" => \$post_install,
"NO_INSTALL" => \$no_install,
"REBOOT_SCRIPT" => \$reboot_script,
Expand Down Expand Up @@ -1669,6 +1671,12 @@ sub install {

return if ($no_install);

if (defined($pre_install)) {
my $cp_pre_install = eval_kernel_version $pre_install;
run_command "$cp_pre_install" or
dodie "Failed to run pre install";
}

my $cp_target = eval_kernel_version $target_image;

run_scp_install "$outputdir/$build_target", "$cp_target" or
Expand Down
8 changes: 8 additions & 0 deletions trunk/tools/testing/ktest/sample.conf
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,14 @@
# (default "")
#BUILD_OPTIONS = -j20

# If you need to do some special handling before installing
# you can add a script with this option.
# The environment variable KERNEL_VERSION will be set to the
# kernel version that is used.
#
# default (undefined)
#PRE_INSTALL = ssh user@target rm -rf '/lib/modules/*-test*'

# If you need an initrd, you can add a script or code here to install
# it. The environment variable KERNEL_VERSION will be set to the
# kernel version that is used. Remember to add the initrd line
Expand Down

0 comments on commit e23a003

Please sign in to comment.