| Message ID | 20191219131855.28799-2-pengfei.xu@intel.com |
|---|---|
| State | Superseded |
| Delegated to: | Petr Vorel |
| Headers | show |
| Series | [v4,1/4] lib/tst_kconfig.c: Add any kconfig to match the expected value function | expand |
diff --git a/testcases/kernel/security/umip/umip_basic_test.c b/testcases/kernel/security/umip/umip_basic_test.c index 1baa26c52..24eca8890 100644 --- a/testcases/kernel/security/umip/umip_basic_test.c +++ b/testcases/kernel/security/umip/umip_basic_test.c @@ -171,7 +171,7 @@ static struct tst_test test = { .forks_child = 1, .test = verify_umip_instruction, .needs_kconfigs = (const char *[]){ - "CONFIG_X86_INTEL_UMIP=y", + "CONFIG_X86_INTEL_UMIP|CONFIG_X86_UMIP=y", NULL }, .needs_root = 1,
From v5.5 main line, umip kconfig changed from "CONFIG_X86_INTEL_UMIP=y" to "CONFIG_X86_UMIP=y". We could use "CONFIG_X86_INTEL_UMIP|CONFIG_X86_UMIP=y" to check kconfig CONFIG_X86_INTEL_UMIP=y(old kernel) or CONFIG_X86_UMIP=y(new kernel) for umip. Signed-off-by: Pengfei Xu <pengfei.xu@intel.com> --- testcases/kernel/security/umip/umip_basic_test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)