aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Rostedt2012-12-11 19:16:03 -0600
committerSteven Rostedt2012-12-11 19:23:22 -0600
commit189251705649bdfdf5e5850eb178f8cbfdac5480 (patch)
treebad44eb0f56899d1ef5278275ef5c1a662b7d63b
parent7786954c95dbeba26ef39d2b6899bf06fbf2b629 (diff)
downloadkernel-omap-189251705649bdfdf5e5850eb178f8cbfdac5480.tar.gz
kernel-omap-189251705649bdfdf5e5850eb178f8cbfdac5480.tar.xz
kernel-omap-189251705649bdfdf5e5850eb178f8cbfdac5480.zip
ktest: Fix breakage from change of oldnoconfig to olddefconfig
Commit fb16d891 "kconfig: replace 'oldnoconfig' with 'olddefconfig', and keep the old name", changed ktest's default config update from oldnoconfig to olddefconfig without adding oldnoconfig as a backup. The make oldnoconfig works much better than its backup of: yes '' | make oldconfig But due to this change, and the fact that ktest is used to build lots of older kernels (and for bisects), it forgoes the oldnoconfig completely. Cc: Adam Lee <adam8157@gmail.com> Cc: Michal Marek <mmarek@suse.cz> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
-rwxr-xr-xtools/testing/ktest/ktest.pl12
1 files changed, 8 insertions, 4 deletions
diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl
index 067337bbce7b..6b1e0c5edc5b 100755
--- a/tools/testing/ktest/ktest.pl
+++ b/tools/testing/ktest/ktest.pl
@@ -1966,10 +1966,14 @@ sub make_oldconfig {
1966 1966
1967 if (!run_command "$make olddefconfig") { 1967 if (!run_command "$make olddefconfig") {
1968 # Perhaps olddefconfig doesn't exist in this version of the kernel 1968 # Perhaps olddefconfig doesn't exist in this version of the kernel
1969 # try a yes '' | oldconfig 1969 # try oldnoconfig
1970 doprint "olddefconfig failed, trying yes '' | make oldconfig\n"; 1970 doprint "olddefconfig failed, trying make oldnoconfig\n";
1971 run_command "yes '' | $make oldconfig" or 1971 if (!run_command "$make oldnoconfig") {
1972 dodie "failed make config oldconfig"; 1972 doprint "oldnoconfig failed, trying yes '' | make oldconfig\n";
1973 # try a yes '' | oldconfig
1974 run_command "yes '' | $make oldconfig" or
1975 dodie "failed make config oldconfig";
1976 }
1973 } 1977 }
1974} 1978}
1975 1979