aboutsummaryrefslogtreecommitdiffstats
path: root/tools/testing
diff options
context:
space:
mode:
authorAdam Lee <adam8157@gmail.com>2012-08-31 13:05:17 -0400
committerMichal Marek <mmarek@suse.cz>2012-09-27 12:18:07 -0400
commitfb16d8912db5268f29706010ecafff74b971c58d (patch)
treeaa79ca1cbc5be1e4afde9bc90c856e4419403591 /tools/testing
parent95ac9b3b585d20df116c5bea1511d9eb5758ac81 (diff)
kconfig: replace 'oldnoconfig' with 'olddefconfig', and keep the old name as an alias
As 67d34a6a391369269a2e5dba8a5f42cc4cd50231 said, 'oldnoconfig' doesn't set new symbols to 'n', but instead sets it to their default values. So, this patch replaces 'oldnoconfig' with 'olddefconfig', stop making people confused, and keep the old name 'oldnoconfig' as an alias, because people already are dependent on its behavior with the counter-intuitive name. Signed-off-by: Adam Lee <adam8157@gmail.com> Signed-off-by: Michal Marek <mmarek@suse.cz>
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 52b7959cd513..0ed73b5ebbfc 100755
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -1871,10 +1871,10 @@ sub make_oldconfig {
1871 apply_min_config; 1871 apply_min_config;
1872 } 1872 }
1873 1873
1874 if (!run_command "$make oldnoconfig") { 1874 if (!run_command "$make olddefconfig") {
1875 # Perhaps oldnoconfig doesn't exist in this version of the kernel 1875 # Perhaps olddefconfig doesn't exist in this version of the kernel
1876 # try a yes '' | oldconfig 1876 # try a yes '' | oldconfig
1877 doprint "oldnoconfig failed, trying yes '' | make oldconfig\n"; 1877 doprint "olddefconfig failed, trying yes '' | make oldconfig\n";
1878 run_command "yes '' | $make oldconfig" or 1878 run_command "yes '' | $make oldconfig" or
1879 dodie "failed make config oldconfig"; 1879 dodie "failed make config oldconfig";
1880 } 1880 }
@@ -1927,7 +1927,7 @@ sub build {
1927 1927
1928 # old config can ask questions 1928 # old config can ask questions
1929 if ($type eq "oldconfig") { 1929 if ($type eq "oldconfig") {
1930 $type = "oldnoconfig"; 1930 $type = "olddefconfig";
1931 1931
1932 # allow for empty configs 1932 # allow for empty configs
1933 run_command "touch $output_config"; 1933 run_command "touch $output_config";
@@ -1957,7 +1957,7 @@ sub build {
1957 load_force_config($minconfig); 1957 load_force_config($minconfig);
1958 } 1958 }
1959 1959
1960 if ($type ne "oldnoconfig") { 1960 if ($type ne "olddefconfig") {
1961 run_command "$make $type" or 1961 run_command "$make $type" or
1962 dodie "failed make config"; 1962 dodie "failed make config";
1963 } 1963 }
@@ -2456,8 +2456,7 @@ my %config_set;
2456 2456
2457# config_off holds the set of configs that the bad config had disabled. 2457# config_off holds the set of configs that the bad config had disabled.
2458# We need to record them and set them in the .config when running 2458# We need to record them and set them in the .config when running
2459# oldnoconfig, because oldnoconfig does not turn off new symbols, but 2459# olddefconfig, because olddefconfig keeps the defaults.
2460# instead just keeps the defaults.
2461my %config_off; 2460my %config_off;
2462 2461
2463# config_off_tmp holds a set of configs to turn off for now 2462# config_off_tmp holds a set of configs to turn off for now
@@ -3248,7 +3247,7 @@ sub test_this_config {
3248 } 3247 }
3249 3248
3250 # Remove this config from the list of configs 3249 # Remove this config from the list of configs
3251 # do a make oldnoconfig and then read the resulting 3250 # do a make olddefconfig and then read the resulting
3252 # .config to make sure it is missing the config that 3251 # .config to make sure it is missing the config that
3253 # we had before 3252 # we had before
3254 my %configs = %min_configs; 3253 my %configs = %min_configs;