aljaz/kata-containers
1
0
Fork 0
mirror of https://github.com/aljazceru/kata-containers.git synced 2026-02-23 15:34:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7789 from beraldoleal/tests/amd

Browse Source 
Fixes tests on AMD machines
This commit is contained in:
Jeremi Piotrowski
2023-08-31 11:23:51 +02:00
committed by GitHub
parent b467f2ef68 00e7ffd988
commit d7612440b8
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/runtime/cmd/kata-runtime/kata-check_amd64_test.go
View File

@@ -51,6 +51,7 @@ func TestCCCheckCLIFunction(t *testing.T) {
var cpuData []testCPUData
var moduleData []testModuleData
cpuType = getCPUtype()
if cpuType == cpuTypeIntel {
cpuData = []testCPUData{
{archGenuineIntel, "lm vmx sse4_1", false},
@@ -466,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)

7
src/runtime/cmd/kata-runtime/kata-env_amd64_test.go
View File

@@ -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)