Commit 189251705649bdfdf5e5850eb178f8cbfdac5480
Committed by
Steven Rostedt
Steven Rostedt
1 parent
7786954c95
Exists in
smarc-l5.0.0_1.0.0-ga
and in
5 other branches
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>
Showing 1 changed file with 8 additions and 4 deletions Side-by-side Diff
tools/testing/ktest/ktest.pl
| ... | ... | @@ -1966,10 +1966,14 @@ |
| 1966 | 1966 | |
| 1967 | 1967 | if (!run_command "$make olddefconfig") { |
| 1968 | 1968 | # Perhaps olddefconfig doesn't exist in this version of the kernel |
| 1969 | - # try a yes '' | oldconfig | |
| 1970 | - doprint "olddefconfig failed, trying yes '' | make oldconfig\n"; | |
| 1971 | - run_command "yes '' | $make oldconfig" or | |
| 1972 | - dodie "failed make config oldconfig"; | |
| 1969 | + # try oldnoconfig | |
| 1970 | + doprint "olddefconfig failed, trying make oldnoconfig\n"; | |
| 1971 | + if (!run_command "$make oldnoconfig") { | |
| 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 |