ktest: Add manual bisect (c960bb9f) · Commits · 戴 / test

tools/testing/ktest/ktest.pl

+31 −2

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@ $default{"POWEROFF_ON_SUCCESS"} = 0;
		$default{"BUILD_OPTIONS"} = "";
		$default{"BISECT_SLEEP_TIME"} = 60; # sleep time between bisects
		$default{"CLEAR_LOG"} = 0;
		$default{"BISECT_MANUAL"} = 0;
		$default{"SUCCESS_LINE"} = "login:";
		$default{"BOOTED_TIMEOUT"} = 1;
		$default{"DIE_ON_FAILURE"} = 1;
		@@ -81,6 +82,7 @@ my $addconfig;
		my $in_bisect = 0;
		my $bisect_bad = "";
		my $reverse_bisect;
		my $bisect_manual;
		my $in_patchcheck = 0;
		my $run_test;
		my $redirect;
		@@ -1046,6 +1048,21 @@ sub get_version {
		doprint "$version\n";
		}

		sub answer_bisect {
		for (;;) {
		doprint "Pass or fail? [p/f]";
		my $ans = <STDIN>;
		chomp $ans;
		if ($ans eq "p" \|\| $ans eq "P") {
		return 1;
		} elsif ($ans eq "f" \|\| $ans eq "F") {
		return 0;
		} else {
		print "Please answer 'P' or 'F'\n";
		}
		}
		}

		sub child_run_test {
		my $failed = 0;

		@@ -1214,6 +1231,9 @@ sub run_bisect {

		my $ret = run_bisect_test $type, $buildtype;

		if ($bisect_manual) {
		$ret = answer_bisect;
		}

		# Are we looking for where it worked, not failed?
		if ($reverse_bisect) {
		@@ -1524,7 +1544,9 @@ sub run_config_bisect {
		}

		$ret = run_config_bisect_test $type;

		if ($bisect_manual) {
		$ret = answer_bisect;
		}
		if ($ret) {
		process_passed %current_config;
		return 0;
		@@ -1555,7 +1577,13 @@ sub run_config_bisect {
		$half = int($#start_list / 2);
		} while ($half > 0);

		# we found a single config, try it again
		# we found a single config, try it again unless we are running manually

		if ($bisect_manual) {
		process_failed $start_list[0];
		return 1;
		}

		my @tophalf = @start_list[0 .. 0];

		$ret = run_config_bisect_test $type;
		@@ -1925,6 +1953,7 @@ for (my $i = 1; $i <= $opt{"NUM_TESTS"}; $i++) {
		$poweroff_after_halt = set_test_option("POWEROFF_AFTER_HALT", $i);
		$sleep_time = set_test_option("SLEEP_TIME", $i);
		$bisect_sleep_time = set_test_option("BISECT_SLEEP_TIME", $i);
		$bisect_manual = set_test_option("BISECT_MANUAL", $i);
		$store_failures = set_test_option("STORE_FAILURES", $i);
		$timeout = set_test_option("TIMEOUT", $i);
		$booted_timeout = set_test_option("BOOTED_TIMEOUT", $i);

tools/testing/ktest/sample.conf

+16 −0

Original line number	Diff line number	Diff line
		@@ -528,6 +528,15 @@
		# With BISECT_REVERSE = 1, The test will consider failures as
		# good, and success as bad.
		#
		# BISECT_MANUAL = 1 (optional, default 0)
		#
		# In case there's a problem with automating the bisect for
		# whatever reason. (Can't reboot, want to inspect each iteration)
		# Doing a BISECT_MANUAL will have the test wait for you to
		# tell it if the test passed or failed after each iteration.
		# This is basicall the same as running git bisect yourself
		# but ktest will rebuild and install the kernel for you.
		#
		# BISECT_CHECK = 1 (optional, default 0)
		#
		# Just to be sure the good is good and bad is bad, setting
		@@ -613,10 +622,17 @@
		#
		# CONFIG_BISECT is the config that failed to boot
		#
		# If BISECT_MANUAL is set, it will pause between iterations.
		# This is useful to use just ktest.pl just for the config bisect.
		# If you set it to build, it will run the bisect and you can
		# control what happens in between iterations. It will ask you if
		# the test succeeded or not and continue the config bisect.
		#
		# Example:
		# TEST_START
		# TEST_TYPE = config_bisect
		# CONFIG_BISECT_TYPE = build
		# CONFIG_BISECT = /home/test/¢onfig-bad
		# MIN_CONFIG = /home/test/config-min
		# BISECT_MANUAL = 1
		#

Admin message