aboutsummaryrefslogtreecommitdiffstats
path: root/tools/testing/ktest/ktest.pl
diff options
context:
space:
mode:
Diffstat (limited to 'tools/testing/ktest/ktest.pl')
-rwxr-xr-xtools/testing/ktest/ktest.pl19
1 files changed, 7 insertions, 12 deletions
diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index e826704703f4..8d02ccb10c59 100755
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -1970,12 +1970,6 @@ sub config_bisect {
1970 unlink $tmpconfig; 1970 unlink $tmpconfig;
1971 } 1971 }
1972 1972
1973 # Add other configs
1974 if (defined($addconfig)) {
1975 run_command "cat $addconfig >> $tmpconfig" or
1976 dodie "failed to append $addconfig";
1977 }
1978
1979 if (-f $tmpconfig) { 1973 if (-f $tmpconfig) {
1980 load_force_config($tmpconfig); 1974 load_force_config($tmpconfig);
1981 process_config_ignore $tmpconfig; 1975 process_config_ignore $tmpconfig;
@@ -1997,7 +1991,7 @@ sub config_bisect {
1997 } 1991 }
1998 close(IN); 1992 close(IN);
1999 1993
2000 # Now run oldconfig with the minconfig (and addconfigs) 1994 # Now run oldconfig with the minconfig
2001 make_oldconfig; 1995 make_oldconfig;
2002 1996
2003 # check to see what we lost (or gained) 1997 # check to see what we lost (or gained)
@@ -2901,11 +2895,12 @@ for (my $i = 1; $i <= $opt{"NUM_TESTS"}; $i++) {
2901 unlink $dmesg; 2895 unlink $dmesg;
2902 unlink $buildlog; 2896 unlink $buildlog;
2903 2897
2904 if (!defined($minconfig)) { 2898 if (defined($addconfig)) {
2905 $minconfig = $addconfig; 2899 my $min = $minconfig;
2906 2900 if (!defined($minconfig)) {
2907 } elsif (defined($addconfig)) { 2901 $min = "";
2908 run_command "cat $addconfig $minconfig > $tmpdir/add_config" or 2902 }
2903 run_command "cat $addconfig $min > $tmpdir/add_config" or
2909 dodie "Failed to create temp config"; 2904 dodie "Failed to create temp config";
2910 $minconfig = "$tmpdir/add_config"; 2905 $minconfig = "$tmpdir/add_config";
2911 } 2906 }