From 00e7ffd988cd3d04f6195ed9a2d2a9b575513896 Mon Sep 17 00:00:00 2001 From: Beraldo Leal Date: Tue, 29 Aug 2023 17:21:17 -0400 Subject: [PATCH] tests: check vmx only on Intel machines When running on amd machines, those tests will fail because there is no vmx flag. Following other tests that checks for cpuType, let's adapt them to restrict vmx only on Intel machines. Fixes #7788. Related #5066 Signed-off-by: Beraldo Leal --- src/runtime/cmd/kata-runtime/kata-check_amd64_test.go | 7 ++++++- src/runtime/cmd/kata-runtime/kata-env_amd64_test.go | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/runtime/cmd/kata-runtime/kata-check_amd64_test.go b/src/runtime/cmd/kata-runtime/kata-check_amd64_test.go index 24fdf2c338..f2b1077786 100644 --- a/src/runtime/cmd/kata-runtime/kata-check_amd64_test.go +++ b/src/runtime/cmd/kata-runtime/kata-check_amd64_test.go @@ -467,7 +467,12 @@ func TestSetCPUtype(t *testing.T) { assert.NotEmpty(archRequiredCPUAttribs) assert.NotEmpty(archRequiredKernelModules) - assert.Equal(archRequiredCPUFlags["vmx"], "Virtualization support") + cpuType = getCPUtype() + if cpuType == cpuTypeIntel { + assert.Equal(archRequiredCPUFlags["vmx"], "Virtualization support") + } else if cpuType == cpuTypeAMD { + assert.Equal(archRequiredCPUFlags["svm"], "Virtualization support") + } _, ok := archRequiredKernelModules["kvm"] assert.True(ok) diff --git a/src/runtime/cmd/kata-runtime/kata-env_amd64_test.go b/src/runtime/cmd/kata-runtime/kata-env_amd64_test.go index 7c1fe849db..97245a22bd 100644 --- a/src/runtime/cmd/kata-runtime/kata-env_amd64_test.go +++ b/src/runtime/cmd/kata-runtime/kata-env_amd64_test.go @@ -55,7 +55,12 @@ func TestEnvGetEnvInfoSetsCPUType(t *testing.T) { assert.NotEmpty(archRequiredCPUAttribs) assert.NotEmpty(archRequiredKernelModules) - assert.Equal(archRequiredCPUFlags["vmx"], "Virtualization support") + cpuType = getCPUtype() + if cpuType == cpuTypeIntel { + assert.Equal(archRequiredCPUFlags["vmx"], "Virtualization support") + } else if cpuType == cpuTypeAMD { + assert.Equal(archRequiredCPUFlags["svm"], "Virtualization support") + } _, ok := archRequiredKernelModules["kvm"] assert.True(ok)