diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index ff6283a..1f28c45 100644
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -16,28 +16,45 @@
 $| = 1;
 
 my %opt;
+my %default;
 
 #default opts
-$opt{"NUM_BUILDS"}		= 5;
-$opt{"BUILD_TYPE"}		= "randconfig";
-$opt{"MAKE_CMD"}		= "make";
-$opt{"TIMEOUT"}			= 120;
-$opt{"TMP_DIR"}			= "/tmp/autotest";
-$opt{"SLEEP_TIME"}		= 60;	# sleep time between tests
-$opt{"BUILD_NOCLEAN"}		= 0;
-$opt{"REBOOT_ON_ERROR"}		= 0;
-$opt{"POWEROFF_ON_ERROR"}	= 0;
-$opt{"REBOOT_ON_SUCCESS"}	= 1;
-$opt{"POWEROFF_ON_SUCCESS"}	= 0;
-$opt{"BUILD_OPTIONS"}		= "";
-$opt{"BISECT_SLEEP_TIME"}	= 10;   # sleep time between bisects
-$opt{"CLEAR_LOG"}		= 0;
-$opt{"SUCCESS_LINE"}		= "login:";
-$opt{"BOOTED_TIMEOUT"}		= 1;
-$opt{"DIE_ON_FAILURE"}		= 1;
+$default{"NUM_TESTS"}		= 5;
+$default{"REBOOT_TYPE"}		= "grub";
+$default{"TEST_TYPE"}		= "test";
+$default{"BUILD_TYPE"}		= "randconfig";
+$default{"MAKE_CMD"}		= "make";
+$default{"TIMEOUT"}		= 120;
+$default{"TMP_DIR"}		= "/tmp/autotest";
+$default{"SLEEP_TIME"}		= 60;	# sleep time between tests
+$default{"BUILD_NOCLEAN"}	= 0;
+$default{"REBOOT_ON_ERROR"}	= 0;
+$default{"POWEROFF_ON_ERROR"}	= 0;
+$default{"REBOOT_ON_SUCCESS"}	= 1;
+$default{"POWEROFF_ON_SUCCESS"}	= 0;
+$default{"BUILD_OPTIONS"}	= "";
+$default{"BISECT_SLEEP_TIME"}	= 60;   # sleep time between bisects
+$default{"CLEAR_LOG"}		= 0;
+$default{"SUCCESS_LINE"}	= "login:";
+$default{"BOOTED_TIMEOUT"}	= 1;
+$default{"DIE_ON_FAILURE"}	= 1;
 
 my $version;
+my $machine;
+my $tmpdir;
+my $builddir;
+my $outputdir;
+my $test_type;
 my $build_type;
+my $build_options;
+my $reboot_type;
+my $reboot_script;
+my $power_cycle;
+my $reboot_on_error;
+my $poweroff_on_error;
+my $die_on_failure;
+my $power_off;
+my $grub_menu;
 my $grub_number;
 my $target;
 my $make;
@@ -55,6 +72,16 @@
 my $monitor_fp;
 my $monitor_pid;
 my $monitor_cnt = 0;
+my $sleep_time;
+my $bisect_sleep_time;
+my $store_failures;
+my $timeout;
+my $booted_timeout;
+my $console;
+my $success_line;
+my $build_target;
+my $target_image;
+my $localversion;
 
 sub read_config {
     my ($config) = @_;
@@ -70,11 +97,22 @@
 	    my $lvalue = $1;
 	    my $rvalue = $2;
 
+	    if (defined($opt{$lvalue})) {
+		die "Error: Option $lvalue defined more than once!\n";
+	    }
 	    $opt{$lvalue} = $rvalue;
 	}
     }
 
     close(IN);
+
+    # set any defaults
+
+    foreach my $default (keys %default) {
+	if (!defined($opt{$default})) {
+	    $opt{$default} = $default{$default};
+	}
+    }
 }
 
 sub logit {
@@ -96,20 +134,20 @@
     # try to reboot normally
     if (!run_command "ssh $target reboot") {
 	# nope? power cycle it.
-	run_command "$opt{POWER_CYCLE}";
+	run_command "$power_cycle";
     }
 }
 
 sub dodie {
     doprint "CRITICAL FAILURE... ", @_, "\n";
 
-    if ($opt{"REBOOT_ON_ERROR"}) {
+    if ($reboot_on_error && $test_type ne "build") {
 	doprint "REBOOTING\n";
 	reboot;
 
-    } elsif ($opt{"POWEROFF_ON_ERROR"} && defined($opt{"POWER_OFF"})) {
+    } elsif ($poweroff_on_error && defined($power_off)) {
 	doprint "POWERING OFF\n";
-	`$opt{"POWER_OFF"}`;
+	`$power_off`;
     }
 
     die @_;
@@ -120,8 +158,8 @@
 
     my $flags;
 
-    my $pid = open($fp, "$opt{CONSOLE}|") or
-	dodie "Can't open console $opt{CONSOLE}";
+    my $pid = open($fp, "$console|") or
+	dodie "Can't open console $console";
 
     $flags = fcntl($fp, F_GETFL, 0) or
 	dodie "Can't get flags for the socket: $!\n";
@@ -147,6 +185,10 @@
     }
     $monitor_fp = \*MONFD;
     $monitor_pid = open_console $monitor_fp;
+
+    return;
+
+    open(MONFD, "Stop perl from warning about single use of MONFD");
 }
 
 sub end_monitor {
@@ -160,43 +202,50 @@
     my ($time) = @_;
     my $line;
 
-    doprint "Wait for monitor to settle down.\n";
+    doprint "** Wait for monitor to settle down **\n";
 
     # read the monitor and wait for the system to calm down
     do {
 	$line = wait_for_input($monitor_fp, $time);
+	print "$line" if (defined($line));
     } while (defined($line));
+    print "** Monitor flushed **\n";
 }
 
 sub fail {
 
-	if ($opt{"DIE_ON_FAILURE"}) {
+	if ($die_on_failure) {
 		dodie @_;
 	}
 
-	doprint "Failed: ", @_, "\n";
+	doprint "FAILED\n";
 
-	doprint "REBOOTING\n";
-	reboot;
-	start_monitor;
-	wait_for_monitor $opt{"SLEEP_TIME"};
-	end_monitor;
+	# no need to reboot for just building.
+	if ($test_type ne "build") {
+	    doprint "REBOOTING\n";
+	    reboot;
+	    start_monitor;
+	    wait_for_monitor $sleep_time;
+	    end_monitor;
+	}
 
-	return 1 if (!defined($opt{"STORE_FAILURES"}));
+	doprint "**** Failed: ", @_, " ****\n";
+
+	return 1 if (!defined($store_failures));
 
 	my @t = localtime;
 	my $date = sprintf "%04d%02d%02d%02d%02d%02d",
 		1900+$t[5],$t[4],$t[3],$t[2],$t[1],$t[0];
 
-	my $dir = "$opt{MACHINE}-$build_type-fail-$date";
-	my $faildir = "$opt{STORE_FAILURES}/$dir";
+	my $dir = "$machine-$test_type-$build_type-fail-$date";
+	my $faildir = "$store_failures/$dir";
 
 	if (!-d $faildir) {
 	    mkpath($faildir) or
-		die "can't create $opt{STORE_FAILURES}";
+		die "can't create $faildir";
 	}
-	if (-f "$opt{OUTPUT_DIR}/.config") {
-	    cp "$opt{OUTPUT_DIR}/.config", "$faildir/config" or
+	if (-f "$outputdir/.config") {
+	    cp "$outputdir/.config", "$faildir/config" or
 		die "failed to copy .config";
 	}
 	if (-f $buildlog) {
@@ -259,6 +308,9 @@
 
 sub get_grub_index {
 
+    if ($reboot_type ne "grub") {
+	return;
+    }
     return if (defined($grub_number));
 
     doprint "Find grub menu ... ";
@@ -266,7 +318,7 @@
     open(IN, "ssh $target cat /boot/grub/menu.lst |")
 	or die "unable to get menu.lst";
     while (<IN>) {
-	if (/^\s*title\s+$opt{GRUB_MENU}\s*$/) {
+	if (/^\s*title\s+$grub_menu\s*$/) {
 	    $grub_number++;
 	    last;
 	} elsif (/^\s*title\s/) {
@@ -275,13 +327,11 @@
     }
     close(IN);
 
-    die "Could not find '$opt{GRUB_MENU}' in /boot/grub/menu on $opt{MACHINE}"
+    die "Could not find '$grub_menu' in /boot/grub/menu on $machine"
 	if ($grub_number < 0);
     doprint "$grub_number\n";
 }
 
-my $timeout = $opt{"TIMEOUT"};
-
 sub wait_for_input
 {
     my ($fp, $time) = @_;
@@ -314,7 +364,12 @@
 }
 
 sub reboot_to {
-    run_command "ssh $target '(echo \"savedefault --default=$grub_number --once\" | grub --batch; reboot)'";
+    if ($reboot_type eq "grub") {
+	run_command "ssh $target '(echo \"savedefault --default=$grub_number --once\" | grub --batch; reboot)'";
+	return;
+    }
+
+    run_command "$reboot_script";
 }
 
 sub monitor {
@@ -336,7 +391,7 @@
     for (;;) {
 
 	if ($booted) {
-	    $line = wait_for_input($monitor_fp, $opt{"BOOTED_TIMEOUT"});
+	    $line = wait_for_input($monitor_fp, $booted_timeout);
 	} else {
 	    $line = wait_for_input($monitor_fp);
 	}
@@ -349,7 +404,7 @@
 	# we are not guaranteed to get a full line
 	$full_line .= $line;
 
-	if ($full_line =~ /$opt{"SUCCESS_LINE"}/) {
+	if ($full_line =~ /$success_line/) {
 	    $booted = 1;
 	}
 
@@ -376,29 +431,29 @@
 
     close(DMESG);
 
-    if (!$booted) {
-	return 0 if ($in_bisect);
-	fail "failed - never got a boot prompt.\n" and return 0;
-    }
-
     if ($bug) {
 	return 0 if ($in_bisect);
 	fail "failed - got a bug report\n" and return 0;
     }
 
+    if (!$booted) {
+	return 0 if ($in_bisect);
+	fail "failed - never got a boot prompt.\n" and return 0;
+    }
+
     return 1;
 }
 
 sub install {
 
-    run_command "scp $opt{OUTPUT_DIR}/$opt{BUILD_TARGET} $target:$opt{TARGET_IMAGE}" or
+    run_command "scp $outputdir/$build_target $target:$target_image" or
 	dodie "failed to copy image";
 
     my $install_mods = 0;
 
     # should we process modules?
     $install_mods = 0;
-    open(IN, "$opt{OUTPUT_DIR}/.config") or dodie("Can't read config file");
+    open(IN, "$outputdir/.config") or dodie("Can't read config file");
     while (<IN>) {
 	if (/CONFIG_MODULES(=y)?/) {
 	    $install_mods = 1 if (defined($1));
@@ -412,7 +467,7 @@
 	return;
     }
 
-    run_command "$make INSTALL_MOD_PATH=$opt{TMP_DIR} modules_install" or
+    run_command "$make INSTALL_MOD_PATH=$tmpdir modules_install" or
 	dodie "Failed to install modules";
 
     my $modlib = "/lib/modules/$version";
@@ -422,13 +477,13 @@
 	dodie "failed to remove old mods: $modlib";
 
     # would be nice if scp -r did not follow symbolic links
-    run_command "cd $opt{TMP_DIR} && tar -cjf $modtar lib/modules/$version" or
+    run_command "cd $tmpdir && tar -cjf $modtar lib/modules/$version" or
 	dodie "making tarball";
 
-    run_command "scp $opt{TMP_DIR}/$modtar $target:/tmp" or
+    run_command "scp $tmpdir/$modtar $target:/tmp" or
 	dodie "failed to copy modules";
 
-    unlink "$opt{TMP_DIR}/$modtar";
+    unlink "$tmpdir/$modtar";
 
     run_command "ssh $target '(cd / && tar xf /tmp/$modtar)'" or
 	dodie "failed to tar modules";
@@ -456,7 +511,7 @@
 	if (/^\s*(.*?):.*(warning|error)/) {
 	    my $err = $1;
 	    foreach my $file (@files) {
-		my $fullpath = "$opt{BUILD_DIR}/$file";
+		my $fullpath = "$builddir/$file";
 		if ($file eq $err || $fullpath eq $err) {
 		    fail "$file built with warnings" and return 0;
 		}
@@ -476,7 +531,7 @@
     unlink $buildlog;
 
     if ($type =~ /^useconfig:(.*)/) {
-	run_command "cp $1 $opt{OUTPUT_DIR}/.config" or
+	run_command "cp $1 $outputdir/.config" or
 	    dodie "could not copy $1 to .config";
 
 	$type = "oldconfig";
@@ -487,38 +542,38 @@
 	$append = "yes ''|";
 
 	# allow for empty configs
-	run_command "touch $opt{OUTPUT_DIR}/.config";
+	run_command "touch $outputdir/.config";
 
-	run_command "mv $opt{OUTPUT_DIR}/.config $opt{OUTPUT_DIR}/config_temp" or
+	run_command "mv $outputdir/.config $outputdir/config_temp" or
 	    dodie "moving .config";
 
 	if (!$noclean && !run_command "$make mrproper") {
 	    dodie "make mrproper";
 	}
 
-	run_command "mv $opt{OUTPUT_DIR}/config_temp $opt{OUTPUT_DIR}/.config" or
+	run_command "mv $outputdir/config_temp $outputdir/.config" or
 	    dodie "moving config_temp";
 
     } elsif (!$noclean) {
-	unlink "$opt{OUTPUT_DIR}/.config";
+	unlink "$outputdir/.config";
 	run_command "$make mrproper" or
 	    dodie "make mrproper";
     }
 
     # add something to distinguish this build
-    open(OUT, "> $opt{OUTPUT_DIR}/localversion") or dodie("Can't make localversion file");
-    print OUT "$opt{LOCALVERSION}\n";
+    open(OUT, "> $outputdir/localversion") or dodie("Can't make localversion file");
+    print OUT "$localversion\n";
     close(OUT);
 
     if (defined($minconfig)) {
 	$defconfig = "KCONFIG_ALLCONFIG=$minconfig";
     }
 
-    run_command "$defconfig $append $make $type" or
+    run_command "$append $defconfig $make $type" or
 	dodie "failed make config";
 
-    $redirect = "$opt{TMP_DIR}/buildlog";
-    if (!run_command "$make $opt{BUILD_OPTIONS}") {
+    $redirect = "$buildlog";
+    if (!run_command "$make $build_options") {
 	undef $redirect;
 	# bisect may need this to pass
 	return 0 if ($in_bisect);
@@ -530,9 +585,9 @@
 }
 
 sub halt {
-    if (!run_command "ssh $target halt" or defined($opt{"POWER_OFF"})) {
+    if (!run_command "ssh $target halt" or defined($power_off)) {
 	# nope? the zap it!
-	run_command "$opt{POWER_OFF}";
+	run_command "$power_off";
     }
 }
 
@@ -541,15 +596,17 @@
 
     doprint "\n\n*******************************************\n";
     doprint     "*******************************************\n";
-    doprint     "**            SUCCESS!!!!                **\n";
+    doprint     "**           TEST $i SUCCESS!!!!         **\n";
     doprint     "*******************************************\n";
     doprint     "*******************************************\n";
 
-    if ($i != $opt{"NUM_BUILDS"}) {
-	doprint "Reboot and wait $opt{SLEEP_TIME} seconds\n";
+    if ($i != $opt{"NUM_TESTS"} && $test_type ne "build" &&
+	!($test_type eq "patchcheck" && $opt{"PATCHCHECK_TYPE[$i]"} eq "build") &&
+	!($test_type eq "bisect" && $opt{"BISECT_TYPE[$i]"} eq "build")) {
+	doprint "Reboot and wait $sleep_time seconds\n";
 	reboot;
 	start_monitor;
-	wait_for_monitor $opt{"SLEEP_TIME"};
+	wait_for_monitor $sleep_time;
 	end_monitor;
     }
 }
@@ -566,9 +623,9 @@
     my $failed = 0;
 
     # child should have no power
-    $opt{"REBOOT_ON_ERROR"} = 0;
-    $opt{"POWEROFF_ON_ERROR"} = 0;
-    $opt{"DIE_ON_FAILURE"} = 1;
+    $reboot_on_error = 0;
+    $poweroff_on_error = 0;
+    $die_on_failure = 1;
 
     run_command $run_test or $failed = 1;
     exit $failed;
@@ -638,6 +695,36 @@
     return 1;
 }
 
+sub run_git_bisect {
+    my ($command) = @_;
+
+    doprint "$command ... ";
+
+    my $output = `$command 2>&1`;
+    my $ret = $?;
+
+    logit $output;
+
+    if ($ret) {
+	doprint "FAILED\n";
+	dodie "Failed to git bisect";
+    }
+
+    doprint "SUCCESS\n";
+    if ($output =~ m/^(Bisecting: .*\(roughly \d+ steps?\))\s+\[([[:xdigit:]]+)\]/) {
+	doprint "$1 [$2]\n";
+    } elsif ($output =~ m/^([[:xdigit:]]+) is the first bad commit/) {
+	$bisect_bad = $1;
+	doprint "Found bad commit... $1\n";
+	return 0;
+    } else {
+	# we already logged it, just print it now.
+	print $output;
+    }
+
+    return 1;
+}
+
 sub run_bisect {
     my ($type) = @_;
 
@@ -676,11 +763,11 @@
 	$result = "bad";
 
 	# reboot the box to a good kernel
-	if ($type eq "boot") {
-	    doprint "Reboot and sleep $opt{BISECT_SLEEP_TIME} seconds\n";
+	if ($type ne "build") {
+	    doprint "Reboot and sleep $bisect_sleep_time seconds\n";
 	    reboot;
 	    start_monitor;
-	    wait_for_monitor $opt{"BISECT_SLEEP_TIME"};
+	    wait_for_monitor $bisect_sleep_time;
 	    end_monitor;
 	}
     } else {
@@ -696,31 +783,7 @@
 	}
     }
 
-    doprint "git bisect $result ... ";
-    $output = `git bisect $result 2>&1`;
-    $ret = $?;
-
-    logit $output;
-
-    if ($ret) {
-	doprint "FAILED\n";
-	fail "Failed to git bisect";
-    }
-
-    doprint "SUCCESS\n";
-    if ($output =~ m/^(Bisecting: .*\(roughly \d+ steps?\))\s+\[([[:xdigit:]]+)\]/) {
-	doprint "$1 [$2]\n";
-    } elsif ($output =~ m/^([[:xdigit:]]+) is the first bad commit/) {
-	$bisect_bad = $1;
-	doprint "Found bad commit... $1\n";
-	return 0;
-    } else {
-	# we already logged it, just print it now.
-	print $output;
-    }
-
-
-    return 1;
+    return $result;
 }
 
 sub bisect {
@@ -735,6 +798,8 @@
     my $good = $opt{"BISECT_GOOD[$i]"};
     my $bad = $opt{"BISECT_BAD[$i]"};
     my $type = $opt{"BISECT_TYPE[$i]"};
+    my $start = $opt{"BISECT_START[$i]"};
+    my $replay = $opt{"BISECT_REPLAY[$i]"};
 
     if (defined($opt{"BISECT_REVERSE[$i]"}) &&
 	$opt{"BISECT_REVERSE[$i]"} == 1) {
@@ -746,23 +811,83 @@
 
     $in_bisect = 1;
 
-    run_command "git bisect start" or
-	fail "could not start bisect";
-
-    run_command "git bisect good $good" or
-	fail "could not set bisect good to $good";
-
-    run_command "git bisect bad $bad" or
-	fail "could not set bisect good to $bad";
-
     # Can't have a test without having a test to run
     if ($type eq "test" && !defined($run_test)) {
 	$type = "boot";
     }
 
+    my $check = $opt{"BISECT_CHECK[$i]"};
+    if (defined($check) && $check ne "0") {
+
+	# get current HEAD
+	doprint "git rev-list HEAD --max-count=1 ... ";
+	my $head = `git rev-list HEAD --max-count=1`;
+	my $ret = $?;
+
+	logit $head;
+
+	if ($ret) {
+	    doprint "FAILED\n";
+	    dodie "Failed to get git HEAD";
+	}
+
+	print "SUCCESS\n";
+
+	chomp $head;
+
+	if ($check ne "good") {
+	    doprint "TESTING BISECT BAD [$bad]\n";
+	    run_command "git checkout $bad" or
+		die "Failed to checkout $bad";
+
+	    $result = run_bisect $type;
+
+	    if ($result ne "bad") {
+		fail "Tested BISECT_BAD [$bad] and it succeeded" and return 0;
+	    }
+	}
+
+	if ($check ne "bad") {
+	    doprint "TESTING BISECT GOOD [$good]\n";
+	    run_command "git checkout $good" or
+		die "Failed to checkout $good";
+
+	    $result = run_bisect $type;
+
+	    if ($result ne "good") {
+		fail "Tested BISECT_GOOD [$good] and it failed" and return 0;
+	    }
+	}
+
+	# checkout where we started
+	run_command "git checkout $head" or
+	    die "Failed to checkout $head";
+    }
+
+    run_command "git bisect start" or
+	dodie "could not start bisect";
+
+    run_command "git bisect good $good" or
+	dodie "could not set bisect good to $good";
+
+    run_git_bisect "git bisect bad $bad" or
+	dodie "could not set bisect bad to $bad";
+
+    if (defined($replay)) {
+	run_command "git bisect replay $replay" or
+	    dodie "failed to run replay";
+    }
+
+    if (defined($start)) {
+	run_command "git checkout $start" or
+	    dodie "failed to checkout $start";
+    }
+
+    my $test;
     do {
 	$result = run_bisect $type;
-    } while ($result);
+	$test = run_git_bisect "git bisect $result";
+    } while ($test);
 
     run_command "git bisect log" or
 	dodie "could not capture git bisect log";
@@ -883,11 +1008,6 @@
 die "POWER_CYCLE not defined\n"		if (!defined($opt{"POWER_CYCLE"}));
 die "CONSOLE not defined\n"		if (!defined($opt{"CONSOLE"}));
 die "LOCALVERSION not defined\n"	if (!defined($opt{"LOCALVERSION"}));
-die "GRUB_MENU not defined\n"		if (!defined($opt{"GRUB_MENU"}));
-
-chdir $opt{"BUILD_DIR"} || die "can't change directory to $opt{BUILD_DIR}";
-
-$target = "$opt{SSH_USER}\@$opt{MACHINE}";
 
 if ($opt{"CLEAR_LOG"} && defined($opt{"LOG_FILE"})) {
     unlink $opt{"LOG_FILE"};
@@ -899,11 +1019,7 @@
     doprint "$option = $opt{$option}\n";
 }
 
-$buildlog = "$opt{TMP_DIR}/buildlog";
-$dmesg = "$opt{TMP_DIR}/dmesg";
-$make = "$opt{MAKE_CMD} O=$opt{OUTPUT_DIR}";
-
-sub set_build_option {
+sub set_test_option {
     my ($name, $i) = @_;
 
     my $option = "$name\[$i\]";
@@ -920,16 +1036,74 @@
 }
 
 # First we need to do is the builds
-for (my $i = 1; $i <= $opt{"NUM_BUILDS"}; $i++) {
+for (my $i = 1; $i <= $opt{"NUM_TESTS"}; $i++) {
 
-    $build_type = set_build_option("BUILD_TYPE", $i);
-    $noclean = set_build_option("BUILD_NOCLEAN", $i);
-    $minconfig = set_build_option("MIN_CONFIG", $i);
-    $run_test = set_build_option("TEST", $i);
-    $addconfig = set_build_option("ADD_CONFIG", $i);
+    my $ssh_user = set_test_option("SSH_USER", $i);
+    my $makecmd = set_test_option("MAKE_CMD", $i);
+
+    $machine = set_test_option("MACHINE", $i);
+    $tmpdir = set_test_option("TMP_DIR", $i);
+    $outputdir = set_test_option("OUTPUT_DIR", $i);
+    $builddir = set_test_option("BUILD_DIR", $i);
+    $test_type = set_test_option("TEST_TYPE", $i);
+    $build_type = set_test_option("BUILD_TYPE", $i);
+    $build_options = set_test_option("BUILD_OPTIONS", $i);
+    $power_cycle = set_test_option("POWER_CYCLE", $i);
+    $noclean = set_test_option("BUILD_NOCLEAN", $i);
+    $minconfig = set_test_option("MIN_CONFIG", $i);
+    $run_test = set_test_option("TEST", $i);
+    $addconfig = set_test_option("ADD_CONFIG", $i);
+    $reboot_type = set_test_option("REBOOT_TYPE", $i);
+    $grub_menu = set_test_option("GRUB_MENU", $i);
+    $reboot_script = set_test_option("REBOOT_SCRIPT", $i);
+    $reboot_on_error = set_test_option("REBOOT_ON_ERROR", $i);
+    $poweroff_on_error = set_test_option("POWEROFF_ON_ERROR", $i);
+    $die_on_failure = set_test_option("DIE_ON_FAILURE", $i);
+    $power_off = set_test_option("POWER_OFF", $i);
+    $sleep_time = set_test_option("SLEEP_TIME", $i);
+    $bisect_sleep_time = set_test_option("BISECT_SLEEP_TIME", $i);
+    $store_failures = set_test_option("STORE_FAILURES", $i);
+    $timeout = set_test_option("TIMEOUT", $i);
+    $booted_timeout = set_test_option("BOOTED_TIMEOUT", $i);
+    $console = set_test_option("CONSOLE", $i);
+    $success_line = set_test_option("SUCCESS_LINE", $i);
+    $build_target = set_test_option("BUILD_TARGET", $i);
+    $target_image = set_test_option("TARGET_IMAGE", $i);
+    $localversion = set_test_option("LOCALVERSION", $i);
+
+    chdir $builddir || die "can't change directory to $builddir";
+
+    if (!-d $tmpdir) {
+	mkpath($tmpdir) or
+	    die "can't create $tmpdir";
+    }
+
+    $target = "$ssh_user\@$machine";
+
+    $buildlog = "$tmpdir/buildlog-$machine";
+    $dmesg = "$tmpdir/dmesg-$machine";
+    $make = "$makecmd O=$outputdir";
+
+    if ($reboot_type eq "grub") {
+	dodie "GRUB_MENU not defined\n" if (!defined($grub_menu));
+    } elsif (!defined($reboot_script)) {
+	dodie "REBOOT_SCRIPT not defined\n"
+    }
+
+    my $run_type = $build_type;
+    if ($test_type eq "patchcheck") {
+	$run_type = $opt{"PATCHCHECK_TYPE[$i]"};
+    } elsif ($test_type eq "bisect") {
+	$run_type = $opt{"BISECT_TYPE[$i]"};
+    }
+
+    # mistake in config file?
+    if (!defined($run_type)) {
+	$run_type = "ERROR";
+    }
 
     doprint "\n\n";
-    doprint "RUNNING TEST $i of $opt{NUM_BUILDS} with option $build_type\n\n";
+    doprint "RUNNING TEST $i of $opt{NUM_TESTS} with option $test_type $run_type\n\n";
 
     unlink $dmesg;
     unlink $buildlog;
@@ -938,9 +1112,9 @@
 	$minconfig = $addconfig;
 
     } elsif (defined($addconfig)) {
-	run_command "cat $addconfig $minconfig > $opt{TMP_DIR}/use_config" or
+	run_command "cat $addconfig $minconfig > $tmpdir/use_config" or
 	    dodie "Failed to create temp config";
-	$minconfig = "$opt{TMP_DIR}/use_config";
+	$minconfig = "$tmpdir/use_config";
     }
 
     my $checkout = $opt{"CHECKOUT[$i]"};
@@ -949,10 +1123,10 @@
 	    die "failed to checkout $checkout";
     }
 
-    if ($build_type eq "bisect") {
+    if ($test_type eq "bisect") {
 	bisect $i;
 	next;
-    } elsif ($build_type eq "patchcheck") {
+    } elsif ($test_type eq "patchcheck") {
 	patchcheck $i;
 	next;
     }
@@ -961,25 +1135,28 @@
 	build $build_type or next;
     }
 
-    get_grub_index;
-    get_version;
-    install;
+    if ($test_type ne "build") {
+	get_grub_index;
+	get_version;
+	install;
 
-    my $failed = 0;
-    start_monitor;
-    monitor or $failed = 1;;
-    if (!$failed && defined($run_test)) {
-	do_run_test or $failed = 1;
+	my $failed = 0;
+	start_monitor;
+	monitor or $failed = 1;;
+
+	if (!$failed && $test_type ne "boot" && defined($run_test)) {
+	    do_run_test or $failed = 1;
+	}
+	end_monitor;
+	next if ($failed);
     }
-    end_monitor;
-    next if ($failed);
 
     success $i;
 }
 
 if ($opt{"POWEROFF_ON_SUCCESS"}) {
     halt;
-} elsif ($opt{"REBOOT_ON_SUCCESS"}) {
+} elsif ($opt{"REBOOT_ON_SUCCESS"} && $test_type ne "build") {
     reboot;
 }
 
diff --git a/tools/testing/ktest/sample.conf b/tools/testing/ktest/sample.conf
new file mode 100644
index 0000000..42f803f
--- /dev/null
+++ b/tools/testing/ktest/sample.conf
@@ -0,0 +1,330 @@
+#
+# Config file for autotest.pl
+#
+# Note, all paths must be absolute
+#
+
+# Almost all options may be overwritten per test run, by appending
+# a [x] to the config. For example, to change the test type for
+# the third iteration of tests, you can specify:
+#  (1 is for the first test, 2 for the second, and so on)
+#
+#  TEST_TYPE[3] = build
+#
+# The options that can not be changed like this are:
+#  NUM_TESTS
+#  LOG_FILE
+#  CLEAR_LOG
+#  POWEROFF_ON_SUCCESS
+#  REBOOT_ON_SUCCESS
+#
+
+#### Mandatory Config Options ####
+
+# The machine hostname that you will test
+#MACHINE = target
+
+# The box is expected to have ssh on normal bootup, provide the user
+#  (most likely root, since you need privileged operations)
+#SSH_USER = root
+
+# The directory that contains the Linux source code
+#BUILD_DIR = /home/test/linux.git
+
+# The directory that the objects will be built
+# (can not be same as BUILD_DIR)
+#OUTPUT_DIR = /home/test/build/target
+
+# The location of the compiled file to copy to the target
+# (relative to OUTPUT_DIR)
+#BUILD_TARGET = arch/x86/boot/bzImage
+
+# The place to put your image on the test machine
+#TARGET_IMAGE = /boot/vmlinuz-test
+
+# A script or command to reboot the box
+# Here is a digital loggers power switch example
+#POWER_CYCLE = wget --no-proxy -O /dev/null -q  --auth-no-challenge 'http://admin:admin@power/outlet?5=CCL'
+# Here is an example to reboot a virtual box on the current host
+# with the name "Guest".
+#POWER_CYCLE = virsh list | grep '\<Guest\>' | awk '{printf ("%d", $1)}' | xargs virsh destroy; sleep 5; virsh start Guest
+
+# The script or command that reads the console
+#  If you use ttywatch server, something like the following would work.
+#CONSOLE = nc -d localhost 3001
+# For a virtual machine with guest name "Guest".
+#CONSOLE =  virsh console `virsh list | grep '\<Guest\>' | awk '{printf ("%d", $1)}'`
+
+# Required version ending to differentiate the test
+# from other linux builds on the system.
+#LOCALVERSION = -test
+
+# The grub title name for the test kernel to boot
+# (Only mandatory if REBOOT_TYPE = grub)
+#
+# For example, if in the /boot/grub/menu.lst the test kernel title has:
+# title Test Kernel
+#GRUB_MENU = Test Kernel
+
+# A script to reboot the target into the test kernel
+# (Only mandatory if REBOOT_TYPE = script)
+#REBOOT_SCRIPT =
+
+#### Optional Config Options (all have defaults) ####
+
+# The number of tests to run (default 5)
+#NUM_TESTS = 5
+
+# The default test type (default test)
+# The test types may be:
+#   build - only build the kernel, do nothing else
+#   boot - build and boot the kernel
+#   test - build, boot and if TEST is set, run the test script
+#   bisect - Perform a bisect on the kernel (see BISECT_TYPE below)
+#   patchcheck - Do a test on a series of commits in git (see PATCHCHECK below)
+#TEST_TYPE = test
+
+# The build type is any make config type or a command.
+#  (default randconfig)
+#   nobuild - skip the clean and build step
+#BUILD_TYPE = randconfig
+
+# The make command (default make)
+# If you are building a 32bit x86 on a 64 bit host
+#MAKE_CMD = CC=i386-gcc AS=i386-as make ARCH=i386
+
+# Way to reboot the box to the test kernel.
+# Only valid options so far are "grub" and "script"
+# (default grub)
+# If you specify grub, it will assume grub version 1
+# and will search in /boot/grub/menu.lst for the title $GRUB_MENU
+# and select that target to reboot to the kernel. If this is not
+# your setup, then specify "script" and have a command or script
+# specified in REBOOT_SCRIPT to boot to the target.
+#REBOOT_TYPE = grub
+
+# Line to define success in output. (default "login:")
+# This is what the line contains, not the entire line. If you need
+# the entire line to match, then use regural expression syntax like
+#  ^MyBox Login:$
+#SUCCESS_LINE = login:
+
+# As the test reads the console, after it hits the SUCCESS_LINE
+# the time it waits for the monitor to settle down between reads
+# can usually be lowered.
+# (in seconds) (default 1)
+#BOOTED_TIMEOUT = 1
+
+# The timeout in seconds when we consider the box hung after
+# the console stop producing output.
+# (default 120)
+#TIMEOUT = 120
+
+# The location on the host where to write temp files
+# (default /tmp/autotest)
+#TMP_DIR = /tmp/autotest
+
+# In between tests, a reboot of the box may occur, and this
+# is the time to wait for the console after it stops producing
+# output. Some machines may not produce a large lag on reboot
+# so this should accommodate it.
+# (default 60)
+#SLEEP_TIME = 60
+
+# The time in between bisects to sleep (in seconds)
+# Can be less than SLEEP_TIME since bisects do more work
+# in between boots. (default 60)
+#BISECT_SLEEP_TIME = 60
+
+# Build without doing a make mrproper, or removing .config
+# (default 0)
+#BUILD_NOCLEAN = 0
+
+# Reboot the target box on error (default 0)
+#REBOOT_ON_ERROR = 0
+
+# Power off the target on error (ignored if REBOOT_ON_ERROR is set)
+# (default 0)
+#POWEROFF_ON_ERROR = 0
+
+# Power off the target after all tests have completed successfully
+# (default 0)
+#POWEROFF_ON_SUCCESS = 0
+
+# Reboot the target after all test completed successfully (default 1)
+# (ignored if POWEROFF_ON_SUCCESS is set)
+#REBOOT_ON_SUCCESS = 1
+
+# Stop testing if a build fails. If set, the script will end if
+# a failure is detected, otherwise it will save off the .config,
+# dmesg and bootlog in a directory called
+# MACHINE-TEST_TYPE_BUILD_TYPE-fail-yyyymmddhhmmss
+# if the STORE_FAILURES directory is set.
+# (default 1)
+# Note, even if this is set to zero, there are some errors that still
+# stop the tests.
+#DIE_ON_FAILURE = 1
+
+# Directory to store failure directories on failure. If this is not
+# set, DIE_ON_FAILURE=0 will not save off the .config, dmesg and
+# bootlog.
+#STORE_FAILURES = /home/test/failures
+
+# A script or command to power off the box (default undef)
+# Needed for POWEROFF_ON_ERROR and SUCCESS
+# Example for digital loggers power switch:
+#POWER_OFF = wget --no-proxy -O /dev/null -q  --auth-no-challenge 'http://admin:admin@power/outlet?5=OFF'
+# Example for a virtual guest call "Guest".
+#POWER_OFF = virsh list | grep '\<GuestF12\>' | awk '{printf ("%d", $1)}' | xargs virsh destroy
+
+# Any build options for the make (default "")
+#BUILD_OPTIONS = -j20
+
+# Optional log file to write the status (recommended)
+# (default undef)
+#LOG_FILE = /home/test/logfiles/target.log
+
+# Remove old logfile if it exists before starting all tests.
+# (default 0)
+#CLEAR_LOG = 0
+
+# Test to run if there is a successful boot and TEST_TYPE is test.
+# Must exit with 0 on success and non zero on error
+# default (undef)
+#TEST = ssh user@machine /root/run_test
+#TEST[1] = ssh root@mxtest /root/run_test
+
+# The min config that is needed to build for the machine
+# A nice way to get this to work, is to do a "lsmod > mymods" on the target
+# copy it to the build server, and then run "make LSMOD=mymods localyesconfig".
+# Then copy all the options that are set: "grep '^CONFIG' > /home/test/config-min"
+#
+#  You might want to set:
+#   CONFIG_CMDLINE="<your options here>"
+#  randconfig may set the above and override your real command
+#  line options.
+# (default undef)
+#MIN_CONFIG = /home/test/config-min
+
+# Sometimes there's options that just break the boot and
+# you do not care about. Here are a few:
+#   # CONFIG_STAGING is not set
+#  Staging drivers are horrible, and can break the build.
+#   # CONFIG_SCSI_DEBUG is not set
+#  SCSI_DEBUG may change your root partition
+#   # CONFIG_KGDB_SERIAL_CONSOLE is not set
+#  KGDB may cause oops waiting for a connection that's not there.
+# This option points to the file containing config options that will be prepended
+# to the MIN_CONFIG (or be the MIN_CONFIG if it is not set)
+# before running it through randconfig
+# (default undef)
+#ADD_CONFIG = /home/test/config-broken
+
+#### Per test run options ####
+# These are options are per build only. The only exist with the [x]
+# syntax, and there is no general option.
+#
+# All are optional and undef by default
+#
+# CHECKOUT[x] = branch
+#
+#  If the BUILD_DIR is a git repository, then you can set this option
+#  to checkout the given branch before running the TEST. If you
+#  specify this for the first run, that branch will be used for
+#  all preceding tests until a new CHECKOUT[x] is set.
+#
+# For TEST_TYPE[x] = patchcheck
+#
+#  This expects the BUILD_DIR to be a git repository, and
+#  will checkout the PATCHCHECK_START[x].
+#
+#  PATCHCHECK_START[x] is required and is the first patch to
+#   test (the SHA1 of the commit).
+#
+#  PATCHCHECK_END[x] is the last patch to check (default HEAD)
+#
+#  PATCHCHECK_TYPE[x] is required and is the type of test to run:
+#      build, boot, test.
+#
+#   Note, the build test will look for warnings, if a warning occurred
+#     in a file that a commit touches, the build will fail.
+#
+#   If BUILD_NOCLEAN is set, then make mrproper will not be run on
+#   any of the builds, just like all other TEST_TYPE tests. But
+#   what makes patchcheck different from the other tests, is if
+#   BUILD_NOCLEAN is not set, only the first and last patch run
+#   make mrproper. This helps speed up the test.
+#
+# Example:
+#   TEST_TYPE[1] = patchcheck
+#   CHECKOUT[1] = mybranch
+#   PATCHCHECK_TYPE[1] = boot
+#   PATCHCHECK_START[1] = 747e94ae3d1b4c9bf5380e569f614eb9040b79e7
+#   PATCHCHEKC_END[1] = b8b2663bd7c9da04ac804659b9f617c199d0252c
+#
+#
+# For TEST_TYPE[x] = bisect
+#
+# You can specify a git bisect if the BUILD_DIR is a git repository.
+# The MIN_CONFIG will be used for all builds of the bisect. The build type
+# used for bisecting is oldconfig.
+#
+# BISECT_TYPE[x] is the type of test to perform:
+#	build	- bad fails to build
+#	boot	- bad builds but fails to boot
+#	test	- bad boots but fails a test
+#
+# BISECT_GOOD[x] is the commit (SHA1) to label as good
+# BISECT_BAD[x] is the commit to label as bad
+#
+# The above three options are required for a bisect operation.
+#
+# BISECT_REPLAY[x] = /path/to/replay/file (optional, default undefined)
+#
+#   If an operation failed in the bisect that was not expected to
+#   fail. Then the test ends. The state of the BUILD_DIR will be
+#   left off at where the failur occurred. You can examine the
+#   reason for the failure, and perhaps even find a git commit
+#   that would work to continue with. You can run:
+#
+#   git bisect log > /path/to/replay/file
+#
+#   and if BISECT_REPLAY[x] is set, the test will run git bisect replay
+#   before continuing with the bisect.
+#
+# BISECT_START[x] = commit (optional, default undefined)
+#
+#   As with BISECT_REPLAY[x], if the test failed on a commit that
+#   just happen to have a bad commit in the middle of the bisect,
+#   and you need to skip it. If BISECT_START[x] is defined, it
+#   will checkout that commit before continuing with the bisect.
+#
+#   Note, BISECT_REPLAY[x] is executed before BISECT_START[x].
+#
+# BISECT_REVERSE[x] = 1 (optional, default 0)
+#
+#   In those strange instances where it was broken forever
+#   and you are trying to find where it started to work!
+#   Set BISECT_GOOD[x] to the commit that was last known to fail
+#   Set BISECT_BAD[x] to the commit that is known where it started
+#   to work. With BISECT_REVERSE[x] = 1, The test will consider
+#   failures as good, and success as bad.
+#
+# BISECT_CHECK[x] = 1 (optional, default 0)
+#
+#   Just to be sure the good is good and bad is bad, setting
+#   BISECT_CHECK[x] to 1 will start the bisect by first checking
+#   out BISECT_BAD[x] and makes sure it fails, then it will check
+#   out BISECT_GOOD[x] and makes sure it succeeds before starting
+#   the bisect (it works for BISECT_REVERSE[x] too).
+#
+#   You can limit the test to just check BISECT_GOOD[x] or
+#   BISECT_BAD[x] with BISECT_CHECK[x] = good or
+#   BISECT_CHECK[x] = bad, respectively.
+#
+# Example:
+#   TEST_TYPE[1] = bisect
+#   BISECT_GOOD[1] = v2.6.36
+#   BISECT_BAD[1] = b5153163ed580e00c67bdfecb02b2e3843817b3e
+#   BISECT_TYPE[1] = build
+#   MIN_CONFIG[1] = /home/test/config-bisect