2 files changed, 20 insertions, 0 deletions

diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index e91702eee580..8ce58d715aef 100755
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -173,6 +173,7 @@ my $bisect_check;
 
 my $config_bisect;
 my $config_bisect_type;
+my $config_bisect_check;
 
 my $patchcheck_type;
 my $patchcheck_start;
@@ -283,6 +284,7 @@ my %option_map = (
 
     "CONFIG_BISECT"             => \$config_bisect,
     "CONFIG_BISECT_TYPE"        => \$config_bisect_type,
+    "CONFIG_BISECT_CHECK"       => \$config_bisect_check,
 
     "PATCHCHECK_TYPE"           => \$patchcheck_type,
     "PATCHCHECK_START"          => \$patchcheck_start,
@@ -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);
diff --git a/tools/testing/ktest/sample.conf b/tools/testing/ktest/sample.conf
index 19754e0c8c64..e4a12da75ba6 100644
--- a/tools/testing/ktest/sample.conf
+++ b/tools/testing/ktest/sample.conf
@@ -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