git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
[pandora-kernel.git]
/
tools
/
testing
/
ktest
/
ktest.pl
diff --git
a/tools/testing/ktest/ktest.pl
b/tools/testing/ktest/ktest.pl
index
c05bcd2
..
b51d787
100755
(executable)
--- a/
tools/testing/ktest/ktest.pl
+++ b/
tools/testing/ktest/ktest.pl
@@
-1873,10
+1873,10
@@
sub make_oldconfig {
apply_min_config;
}
apply_min_config;
}
- if (!run_command "$make old
no
config") {
- # Perhaps old
no
config doesn't exist in this version of the kernel
+ if (!run_command "$make old
def
config") {
+ # Perhaps old
def
config doesn't exist in this version of the kernel
# try a yes '' | oldconfig
# try a yes '' | oldconfig
- doprint "old
no
config failed, trying yes '' | make oldconfig\n";
+ doprint "old
def
config failed, trying yes '' | make oldconfig\n";
run_command "yes '' | $make oldconfig" or
dodie "failed make config oldconfig";
}
run_command "yes '' | $make oldconfig" or
dodie "failed make config oldconfig";
}
@@
-1929,7
+1929,7
@@
sub build {
# old config can ask questions
if ($type eq "oldconfig") {
# old config can ask questions
if ($type eq "oldconfig") {
- $type = "old
no
config";
+ $type = "old
def
config";
# allow for empty configs
run_command "touch $output_config";
# allow for empty configs
run_command "touch $output_config";
@@
-1959,7
+1959,7
@@
sub build {
load_force_config($minconfig);
}
load_force_config($minconfig);
}
- if ($type ne "old
no
config") {
+ if ($type ne "old
def
config") {
run_command "$make $type" or
dodie "failed make config";
}
run_command "$make $type" or
dodie "failed make config";
}
@@
-2458,8
+2458,7
@@
my %config_set;
# config_off holds the set of configs that the bad config had disabled.
# We need to record them and set them in the .config when running
# config_off holds the set of configs that the bad config had disabled.
# We need to record them and set them in the .config when running
-# oldnoconfig, because oldnoconfig does not turn off new symbols, but
-# instead just keeps the defaults.
+# olddefconfig, because olddefconfig keeps the defaults.
my %config_off;
# config_off_tmp holds a set of configs to turn off for now
my %config_off;
# config_off_tmp holds a set of configs to turn off for now
@@
-3250,7
+3249,7
@@
sub test_this_config {
}
# Remove this config from the list of configs
}
# Remove this config from the list of configs
- # do a make old
no
config and then read the resulting
+ # do a make old
def
config and then read the resulting
# .config to make sure it is missing the config that
# we had before
my %configs = %min_configs;
# .config to make sure it is missing the config that
# we had before
my %configs = %min_configs;