Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 319797
b: refs/heads/master
c: b091861
h: refs/heads/master
i:
  319795: 334c33a
v: v3
  • Loading branch information
Steven Rostedt authored and Steven Rostedt committed Jul 19, 2012
1 parent e23a003 commit 0420aa5
Show file tree
Hide file tree
Showing 3 changed files with 21 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: e5c2ec11a07b9e1e7eb714aad13583e2bbae49bd
refs/heads/master: b0918612545e698e55889c15d25e5118ea09c1fd
14 changes: 14 additions & 0 deletions trunk/tools/testing/ktest/ktest.pl
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@

my $config_bisect;
my $config_bisect_type;
my $config_bisect_check;

my $patchcheck_type;
my $patchcheck_start;
Expand Down Expand Up @@ -283,6 +284,7 @@

"CONFIG_BISECT" => \$config_bisect,
"CONFIG_BISECT_TYPE" => \$config_bisect_type,
"CONFIG_BISECT_CHECK" => \$config_bisect_check,

"PATCHCHECK_TYPE" => \$patchcheck_type,
"PATCHCHECK_START" => \$patchcheck_start,
Expand Down Expand Up @@ -2743,6 +2745,18 @@ sub config_bisect {
}
}
my $ret;

if (defined($config_bisect_check) && $config_bisect_check) {
doprint " Checking to make sure bad config with min config fails\n";
create_config keys %config_list;
$ret = run_config_bisect_test $config_bisect_type;
if ($ret) {
doprint " FAILED! Bad config with min config boots fine\n";
return -1;
}
doprint " Bad config with min config fails as expected\n";
}

do {
$ret = run_config_bisect;
} while (!$ret);
Expand Down
6 changes: 6 additions & 0 deletions trunk/tools/testing/ktest/sample.conf
Original file line number Diff line number Diff line change
Expand Up @@ -1077,6 +1077,12 @@
# can specify it with CONFIG_BISECT_GOOD. Otherwise
# the MIN_CONFIG is the base.
#
# CONFIG_BISECT_CHECK (optional)
# Set this to 1 if you want to confirm that the config ktest
# generates (the bad config with the min config) is still bad.
# It may be that the min config fixes what broke the bad config
# and the test will not return a result.
#
# Example:
# TEST_START
# TEST_TYPE = config_bisect
Expand Down

0 comments on commit 0420aa5

Please sign in to comment.