aboutsummaryrefslogtreecommitdiffstats
path: root/tools/testing
diff options
context:
space:
mode:
Diffstat (limited to 'tools/testing')
-rwxr-xr-xtools/testing/ktest/ktest.pl15
1 files changed, 7 insertions, 8 deletions
diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index c05bcd293d8c..b51d787176d3 100755
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -1873,10 +1873,10 @@ sub make_oldconfig {
1873 apply_min_config; 1873 apply_min_config;
1874 } 1874 }
1875 1875
1876 if (!run_command "$make oldnoconfig") { 1876 if (!run_command "$make olddefconfig") {
1877 # Perhaps oldnoconfig doesn't exist in this version of the kernel 1877 # Perhaps olddefconfig doesn't exist in this version of the kernel
1878 # try a yes '' | oldconfig 1878 # try a yes '' | oldconfig
1879 doprint "oldnoconfig failed, trying yes '' | make oldconfig\n"; 1879 doprint "olddefconfig failed, trying yes '' | make oldconfig\n";
1880 run_command "yes '' | $make oldconfig" or 1880 run_command "yes '' | $make oldconfig" or
1881 dodie "failed make config oldconfig"; 1881 dodie "failed make config oldconfig";
1882 } 1882 }
@@ -1929,7 +1929,7 @@ sub build {
1929 1929
1930 # old config can ask questions 1930 # old config can ask questions
1931 if ($type eq "oldconfig") { 1931 if ($type eq "oldconfig") {
1932 $type = "oldnoconfig"; 1932 $type = "olddefconfig";
1933 1933
1934 # allow for empty configs 1934 # allow for empty configs
1935 run_command "touch $output_config"; 1935 run_command "touch $output_config";
@@ -1959,7 +1959,7 @@ sub build {
1959 load_force_config($minconfig); 1959 load_force_config($minconfig);
1960 } 1960 }
1961 1961
1962 if ($type ne "oldnoconfig") { 1962 if ($type ne "olddefconfig") {
1963 run_command "$make $type" or 1963 run_command "$make $type" or
1964 dodie "failed make config"; 1964 dodie "failed make config";
1965 } 1965 }
@@ -2458,8 +2458,7 @@ my %config_set;
2458 2458
2459# config_off holds the set of configs that the bad config had disabled. 2459# config_off holds the set of configs that the bad config had disabled.
2460# We need to record them and set them in the .config when running 2460# We need to record them and set them in the .config when running
2461# oldnoconfig, because oldnoconfig does not turn off new symbols, but 2461# olddefconfig, because olddefconfig keeps the defaults.
2462# instead just keeps the defaults.
2463my %config_off; 2462my %config_off;
2464 2463
2465# config_off_tmp holds a set of configs to turn off for now 2464# config_off_tmp holds a set of configs to turn off for now
@@ -3250,7 +3249,7 @@ sub test_this_config {
3250 } 3249 }
3251 3250
3252 # Remove this config from the list of configs 3251 # Remove this config from the list of configs
3253 # do a make oldnoconfig and then read the resulting 3252 # do a make olddefconfig and then read the resulting
3254 # .config to make sure it is missing the config that 3253 # .config to make sure it is missing the config that
3255 # we had before 3254 # we had before
3256 my %configs = %min_configs; 3255 my %configs = %min_configs;