Skip to content

Commit 7b570e2

Browse files
zulinx86zulinx86
committed
test: Do not use --config in integration tests
Now that there is no need to specify `--config` to `cpu-template-helper`, removes `--config` from integration tests and simplifies them. Also regathers fingerprint files. All the fingerprint changes are caused by the difference of the number of vCPUs: the Firecracker's default value is 1 vCPU but the test config value is 2 vCPUs. Signed-off-by: Takahiro Itazuri <[email protected]>
1 parent a8469e9 commit 7b570e2

19 files changed

+144
-193
lines changed

‎tests/data/cpu_template_helper/fingerprint_AMD_MILAN_4.14host.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"firecracker_version": "1.7.0-dev",
3-
"kernel_version": "4.14.334-252.552.amzn2.x86_64",
2+
"firecracker_version": "1.8.0-dev",
3+
"kernel_version": "4.14.336-256.559.amzn2.x86_64",
44
"microcode_version": "0xa0011d1",
55
"bios_version": "1.0",
66
"bios_revision": "0.69",
@@ -41,15 +41,15 @@
4141
},
4242
{
4343
"register": "ebx",
44-
"bitmap": "0b00000000000000100000100000000000"
44+
"bitmap": "0b00000000000000010000100000000000"
4545
},
4646
{
4747
"register": "ecx",
4848
"bitmap": "0b11110111111110100011001000000011"
4949
},
5050
{
5151
"register": "edx",
52-
"bitmap": "0b00010111100010111111101111111111"
52+
"bitmap": "0b00000111100010111111101111111111"
5353
}
5454
]
5555
},
@@ -294,7 +294,7 @@
294294
},
295295
{
296296
"register": "ebx",
297-
"bitmap": "0b00000000000000000000000000000010"
297+
"bitmap": "0b00000000000000000000000000000001"
298298
},
299299
{
300300
"register": "ecx",
@@ -689,7 +689,7 @@
689689
},
690690
{
691691
"register": "ecx",
692-
"bitmap": "0b00000000000000000111000000000001"
692+
"bitmap": "0b00000000000000000111000000000000"
693693
},
694694
{
695695
"register": "edx",
@@ -1187,7 +1187,7 @@
11871187
"modifiers": [
11881188
{
11891189
"register": "eax",
1190-
"bitmap": "0b00000000000000000100000101100011"
1190+
"bitmap": "0b00000000000000000000000101100011"
11911191
},
11921192
{
11931193
"register": "ebx",

‎tests/data/cpu_template_helper/fingerprint_AMD_MILAN_5.10host.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"firecracker_version": "1.7.0-dev",
3-
"kernel_version": "5.10.205-195.804.amzn2.x86_64",
2+
"firecracker_version": "1.8.0-dev",
3+
"kernel_version": "5.10.209-198.858.amzn2.x86_64",
44
"microcode_version": "0xa0011d1",
55
"bios_version": "1.0",
66
"bios_revision": "0.69",
@@ -41,15 +41,15 @@
4141
},
4242
{
4343
"register": "ebx",
44-
"bitmap": "0b00000000000000100000100000000000"
44+
"bitmap": "0b00000000000000010000100000000000"
4545
},
4646
{
4747
"register": "ecx",
4848
"bitmap": "0b11110111111110100011001000000011"
4949
},
5050
{
5151
"register": "edx",
52-
"bitmap": "0b00010111100010111111101111111111"
52+
"bitmap": "0b00000111100010111111101111111111"
5353
}
5454
]
5555
},
@@ -294,7 +294,7 @@
294294
},
295295
{
296296
"register": "ebx",
297-
"bitmap": "0b00000000000000000000000000000010"
297+
"bitmap": "0b00000000000000000000000000000001"
298298
},
299299
{
300300
"register": "ecx",
@@ -735,7 +735,7 @@
735735
},
736736
{
737737
"register": "ecx",
738-
"bitmap": "0b00000000000000000111000000000001"
738+
"bitmap": "0b00000000000000000111000000000000"
739739
},
740740
{
741741
"register": "edx",
@@ -1279,7 +1279,7 @@
12791279
"modifiers": [
12801280
{
12811281
"register": "eax",
1282-
"bitmap": "0b00000000000000000100000101100011"
1282+
"bitmap": "0b00000000000000000000000101100011"
12831283
},
12841284
{
12851285
"register": "ebx",

‎tests/data/cpu_template_helper/fingerprint_AMD_MILAN_6.1host.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"firecracker_version": "1.7.0-dev",
3-
"kernel_version": "6.1.66-93.164.amzn2023.x86_64",
2+
"firecracker_version": "1.8.0-dev",
3+
"kernel_version": "6.1.79-99.164.amzn2023.x86_64",
44
"microcode_version": "0xa0011d1",
55
"bios_version": "1.0",
66
"bios_revision": "0.69",
@@ -41,15 +41,15 @@
4141
},
4242
{
4343
"register": "ebx",
44-
"bitmap": "0b00000000000000100000100000000000"
44+
"bitmap": "0b00000000000000010000100000000000"
4545
},
4646
{
4747
"register": "ecx",
4848
"bitmap": "0b11110111111110100011001000000011"
4949
},
5050
{
5151
"register": "edx",
52-
"bitmap": "0b00010111100010111111101111111111"
52+
"bitmap": "0b00000111100010111111101111111111"
5353
}
5454
]
5555
},
@@ -294,7 +294,7 @@
294294
},
295295
{
296296
"register": "ebx",
297-
"bitmap": "0b00000000000000000000000000000010"
297+
"bitmap": "0b00000000000000000000000000000001"
298298
},
299299
{
300300
"register": "ecx",
@@ -735,7 +735,7 @@
735735
},
736736
{
737737
"register": "ecx",
738-
"bitmap": "0b00000000000000000111000000000001"
738+
"bitmap": "0b00000000000000000111000000000000"
739739
},
740740
{
741741
"register": "edx",
@@ -1279,7 +1279,7 @@
12791279
"modifiers": [
12801280
{
12811281
"register": "eax",
1282-
"bitmap": "0b00000000000000000100000101100011"
1282+
"bitmap": "0b00000000000000000000000101100011"
12831283
},
12841284
{
12851285
"register": "ebx",

‎tests/data/cpu_template_helper/fingerprint_ARM_NEOVERSE_N1_4.14host.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"firecracker_version": "1.7.0-dev",
3-
"kernel_version": "4.14.334-252.552.amzn2.aarch64",
2+
"firecracker_version": "1.8.0-dev",
3+
"kernel_version": "4.14.336-256.559.amzn2.aarch64",
44
"microcode_version": "0x00000000000000ff",
55
"bios_version": "1.0",
66
"bios_revision": "1.0",
@@ -30,7 +30,7 @@
3030
},
3131
{
3232
"addr": "0x6030000000100000",
33-
"bitmap": "0b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010001111111000000000000000000000"
33+
"bitmap": "0b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000111111000000000000000000000"
3434
},
3535
{
3636
"addr": "0x6030000000100002",

‎tests/data/cpu_template_helper/fingerprint_ARM_NEOVERSE_N1_5.10host.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"firecracker_version": "1.7.0-dev",
3-
"kernel_version": "5.10.205-195.804.amzn2.aarch64",
2+
"firecracker_version": "1.8.0-dev",
3+
"kernel_version": "5.10.209-198.858.amzn2.aarch64",
44
"microcode_version": "0x00000000000000ff",
55
"bios_version": "1.0",
66
"bios_revision": "1.0",
@@ -30,7 +30,7 @@
3030
},
3131
{
3232
"addr": "0x6030000000100000",
33-
"bitmap": "0b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010001111111000000000000000000000"
33+
"bitmap": "0b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000111111000000000000000000000"
3434
},
3535
{
3636
"addr": "0x6030000000100002",

‎tests/data/cpu_template_helper/fingerprint_ARM_NEOVERSE_N1_6.1host.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"firecracker_version": "1.7.0-dev",
3-
"kernel_version": "6.1.66-93.164.amzn2023.aarch64",
2+
"firecracker_version": "1.8.0-dev",
3+
"kernel_version": "6.1.79-99.164.amzn2023.aarch64",
44
"microcode_version": "0x00000000000000ff",
55
"bios_version": "1.0",
66
"bios_revision": "1.0",
@@ -30,7 +30,7 @@
3030
},
3131
{
3232
"addr": "0x6030000000100000",
33-
"bitmap": "0b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010001111111000000000000000000000"
33+
"bitmap": "0b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000111111000000000000000000000"
3434
},
3535
{
3636
"addr": "0x6030000000100002",

‎tests/data/cpu_template_helper/fingerprint_ARM_NEOVERSE_V1_4.14host.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"firecracker_version": "1.7.0-dev",
3-
"kernel_version": "4.14.334-252.552.amzn2.aarch64",
2+
"firecracker_version": "1.8.0-dev",
3+
"kernel_version": "4.14.336-256.559.amzn2.aarch64",
44
"microcode_version": "0x0000000000000001",
55
"bios_version": "1.0",
66
"bios_revision": "1.0",
@@ -30,7 +30,7 @@
3030
},
3131
{
3232
"addr": "0x6030000000100000",
33-
"bitmap": "0b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010001111111000000000000000000000"
33+
"bitmap": "0b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000111111000000000000000000000"
3434
},
3535
{
3636
"addr": "0x6030000000100002",

‎tests/data/cpu_template_helper/fingerprint_ARM_NEOVERSE_V1_5.10host.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"firecracker_version": "1.7.0-dev",
3-
"kernel_version": "5.10.205-195.804.amzn2.aarch64",
2+
"firecracker_version": "1.8.0-dev",
3+
"kernel_version": "5.10.209-198.858.amzn2.aarch64",
44
"microcode_version": "0x0000000000000001",
55
"bios_version": "1.0",
66
"bios_revision": "1.0",
@@ -30,7 +30,7 @@
3030
},
3131
{
3232
"addr": "0x6030000000100000",
33-
"bitmap": "0b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010001111111000000000000000000000"
33+
"bitmap": "0b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000111111000000000000000000000"
3434
},
3535
{
3636
"addr": "0x6030000000100002",

‎tests/data/cpu_template_helper/fingerprint_ARM_NEOVERSE_V1_6.1host.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"firecracker_version": "1.7.0-dev",
3-
"kernel_version": "6.1.66-93.164.amzn2023.aarch64",
2+
"firecracker_version": "1.8.0-dev",
3+
"kernel_version": "6.1.79-99.164.amzn2023.aarch64",
44
"microcode_version": "0x0000000000000001",
55
"bios_version": "1.0",
66
"bios_revision": "1.0",
@@ -30,7 +30,7 @@
3030
},
3131
{
3232
"addr": "0x6030000000100000",
33-
"bitmap": "0b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010001111111000000000000000000000"
33+
"bitmap": "0b00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000111111000000000000000000000"
3434
},
3535
{
3636
"addr": "0x6030000000100002",

‎tests/data/cpu_template_helper/fingerprint_INTEL_CASCADELAKE_4.14host.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"firecracker_version": "1.7.0-dev",
3-
"kernel_version": "4.14.334-252.552.amzn2.x86_64",
2+
"firecracker_version": "1.8.0-dev",
3+
"kernel_version": "4.14.336-256.559.amzn2.x86_64",
44
"microcode_version": "0x5003604",
55
"bios_version": "1.0",
66
"bios_revision": "3.80",
@@ -41,15 +41,15 @@
4141
},
4242
{
4343
"register": "ebx",
44-
"bitmap": "0b00000000000000100000100000000000"
44+
"bitmap": "0b00000000000000010000100000000000"
4545
},
4646
{
4747
"register": "ecx",
4848
"bitmap": "0b11110111111110100011001000000011"
4949
},
5050
{
5151
"register": "edx",
52-
"bitmap": "0b00011111100010111111101111111111"
52+
"bitmap": "0b00001111100010111111101111111111"
5353
}
5454
]
5555
},
@@ -106,7 +106,7 @@
106106
"modifiers": [
107107
{
108108
"register": "eax",
109-
"bitmap": "0b00000100000000000000000100100001"
109+
"bitmap": "0b00000000000000000000000100100001"
110110
},
111111
{
112112
"register": "ebx",
@@ -129,7 +129,7 @@
129129
"modifiers": [
130130
{
131131
"register": "eax",
132-
"bitmap": "0b00000100000000000000000100100010"
132+
"bitmap": "0b00000000000000000000000100100010"
133133
},
134134
{
135135
"register": "ebx",
@@ -152,7 +152,7 @@
152152
"modifiers": [
153153
{
154154
"register": "eax",
155-
"bitmap": "0b00000100000000000000000101000011"
155+
"bitmap": "0b00000000000000000000000101000011"
156156
},
157157
{
158158
"register": "ebx",
@@ -175,7 +175,7 @@
175175
"modifiers": [
176176
{
177177
"register": "eax",
178-
"bitmap": "0b00000100000000000100000101100011"
178+
"bitmap": "0b00000000000000000000000101100011"
179179
},
180180
{
181181
"register": "ebx",
@@ -386,7 +386,7 @@
386386
},
387387
{
388388
"register": "ebx",
389-
"bitmap": "0b00000000000000000000000000000010"
389+
"bitmap": "0b00000000000000000000000000000001"
390390
},
391391
{
392392
"register": "ecx",

0 commit comments

Comments
 (0)