ktest: Fix bug when ADD_CONFIG is set but MIN_CONFIG is not

The MIN_CONFIG is a single config that is considered to have all the
configs that are required to boot the box.

ADD_CONFIG is a list of configs that we add that may contain configs
known to be broken (set off) or just configs that we want every box to
have and this can include shared configs.

If a config has no MIN_CONFIG defined, but has multiple files defined
for the ADD_CONFIG, the test will die, because the MIN_CONFIG will
default to ADD_CONFIG. The problem is the code to open MIN_CONFIG
expects a string of one file, not multiple, and the open will fail.

Since the real minconfig that is used is a concatination of MIN_CONFIG
and ADD_CONFIG files, we change the code to open that instead of
whatever MIN_CONFIG defaults to.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>

diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index e826704703f4a2e885a399bd6a24d185d3f14f86..8d02ccb10c598bc8c7a9e926e9b9500c75d51e37 100755 (executable)
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -1970,12 +1970,6 @@ sub config_bisect {
        unlink $tmpconfig;
     }
 
-    # Add other configs
-    if (defined($addconfig)) {
-       run_command "cat $addconfig >> $tmpconfig" or
-           dodie "failed to append $addconfig";
-    }
-
     if (-f $tmpconfig) {
        load_force_config($tmpconfig);
        process_config_ignore $tmpconfig;
@@ -1997,7 +1991,7 @@ sub config_bisect {
     }
     close(IN);
 
-    # Now run oldconfig with the minconfig (and addconfigs)
+    # Now run oldconfig with the minconfig
     make_oldconfig;
 
     # check to see what we lost (or gained)
@@ -2901,11 +2895,12 @@ for (my $i = 1; $i <= $opt{"NUM_TESTS"}; $i++) {
     unlink $dmesg;
     unlink $buildlog;
 
-    if (!defined($minconfig)) {
-       $minconfig = $addconfig;
-
-    } elsif (defined($addconfig)) {
-       run_command "cat $addconfig $minconfig > $tmpdir/add_config" or
+    if (defined($addconfig)) {
+       my $min = $minconfig;
+       if (!defined($minconfig)) {
+           $min = "";
+       }
+       run_command "cat $addconfig $min > $tmpdir/add_config" or
            dodie "Failed to create temp config";
        $minconfig = "$tmpdir/add_config";
     }