Skip to content

Commit 0a69f6d

Browse files
philipandaphilipanda
committed
pre-commit fix
Signed-off-by: Filip Gołaś <[email protected]>
1 parent c63ba66 commit 0a69f6d

File tree

4 files changed

+53
-43
lines changed

4 files changed

+53
-43
lines changed

‎dasharo-stability/coreboot-redundant-boot.robot‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,9 @@ CRB003.201 Boot Slot A After Clearing Attempt Slot B Flag (Ubuntu)
8080
CRB004.201 Slot A Protection (Ubuntu)
8181
[Documentation] Check if the coreboot Slot A is protected with the
8282
... redundant boot feature turned on.
83-
Skip If ${COREBOOT_REDUNDANT_BOOT_BOOTBLOCK_OFFSET} is ${None} ${COREBOOT_REDUNDANT_BOOT_BOOTBLOCK_OFFSET} not defined, skipping test
83+
Skip If
84+
... ${COREBOOT_REDUNDANT_BOOT_BOOTBLOCK_OFFSET} is ${None}
85+
... ${COREBOOT_REDUNDANT_BOOT_BOOTBLOCK_OFFSET} not defined, skipping test
8486
Power On
8587
Boot System Or From Connected Disk ${ENV_ID_UBUNTU}
8688
Login To Linux

‎lib/flash.robot‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -195,11 +195,17 @@ Read Firmware
195195
Get Flashrom Regions
196196
${output}= Execute Command In Terminal flashrom -p internal
197197
${lines}= Split To Lines ${output}
198-
${dict}= Create Dictionary
198+
VAR &{dict}= &{EMPTY}
199199
FOR ${l} IN @{lines}
200-
${m}= Get Regexp Matches ${l} FREG[0-9]+: (.+) region \\((0x[0-9a-f]+)-(0x[0-9a-f]+)\\) is (.+) 1 2 3 4
200+
${m}= Get Regexp Matches
201+
... ${l}
202+
... FREG[0-9]+: (.+) region \\((0x[0-9a-f]+)-(0x[0-9a-f]+)\\) is (.+)
203+
... 1
204+
... 2
205+
... 3
206+
... 4
201207
IF ${m} != []
202-
${region}= Create Dictionary start=${m[0][1]} end=${m[0][2]} state=${m[0][3]}
208+
VAR &{region}= start=${m[0][1]} end=${m[0][2]} state=${m[0][3]}
203209
Set To Dictionary ${dict} ${m[0][0]}=${region}
204210
END
205211
END
@@ -208,11 +214,11 @@ Get Flashrom Regions
208214
Get Flashrom Readonly Offsets
209215
${output}= Execute Command In Terminal flashrom -p internal
210216
${lines}= Split To Lines ${output}
211-
${list}= Create List
217+
VAR @{list}= @{EMPTY}
212218
FOR ${l} IN @{lines}
213219
${m}= Get Regexp Matches ${l} Warning: (0x[0-9a-f]+)-(0x[0-9a-f]+) is read-only 1 2
214220
IF ${m} != []
215-
${region}= Create Dictionary start=${m[0][0]} end=${m[0][1]}
221+
VAR &{region}= start=${m[0][0]} end=${m[0][1]}
216222
Append To List ${list} ${region}
217223
END
218224
END
@@ -226,7 +232,7 @@ Calculate Expected Flashrom Readonly Region
226232
${bios_end}= Get From Dictionary ${flashrom_regions['${region_name}']} end
227233
${expected_readonly_start}= Evaluate hex(${bios_start} + ${COREBOOT_REDUNDANT_BOOT_BOOTBLOCK_OFFSET.start})
228234
${expected_readonly_end}= Evaluate hex(${bios_start} + ${COREBOOT_REDUNDANT_BOOT_BOOTBLOCK_OFFSET.end})
229-
${expected_readonly}= Create Dictionary start=${expected_readonly_start} end=${expected_readonly_end}
235+
VAR &{expected_readonly}= start=${expected_readonly_start} end=${expected_readonly_end}
230236
RETURN ${expected_readonly}
231237

232238
Verify Region Range Protected

‎platform-configs/include/default.robot‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ ${POWERSHELL_STR_HEADSET_IN}= Microphone (Realtek(R) Audio
201201
${POWERSHELL_STR_HDMI_OUT}= Audio Driver for Display Audio
202202
${COREBOOT_REDUNDANT_BOOT_SUPPORT}= ${FALSE}
203203
${COREBOOT_REDUNDANT_BOOT_BOOTBLOCK_OFFSET}= ${NONE}
204+
${COREBOOT_REDUNDANT_BOOT_COREBOOT_OFFSET}= ${NONE}
204205

205206
# Test module: dasharo-security
206207
${TPM_SUPPORTED_VERSION}= ${NONE}

‎platform-configs/protectli-vp6650.robot‎

Lines changed: 37 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -3,45 +3,46 @@ Resource include/protectli-vp66xx.robot
33

44

55
*** Variables ***
6-
${INITIAL_DUT_CONNECTION_METHOD}= Telnet
7-
${DUT_CONNECTION_METHOD}= ${INITIAL_DUT_CONNECTION_METHOD}
8-
${INITIAL_CPU_FREQUENCY}= 1100
9-
${DEF_CORES_PER_SOCKET}= 2
10-
${DEF_THREADS_PER_CORE}= 2
11-
${DEF_THREADS_TOTAL}= 4
12-
${DEF_ONLINE_CPU}= 0-3
13-
${DEF_SOCKETS}= 1
14-
15-
${POWER_CTRL}= sonoff
16-
${WIFI_CARD_UBUNTU}= Qualcomm Atheros QCA6174 802.11ac Wireless Network Adapter
17-
${LTE_CARD}= ${TBD}
18-
${DEVICE_NVME_DISK}= Non-Volatile memory controller
19-
${USB_MODEL}= SanDisk
20-
21-
${DMIDECODE_PRODUCT_NAME}= VP6650
22-
${HAS_E_CORES}= ${TRUE}
23-
24-
${CPU_MIN_FREQUENCY}= 400
25-
${CPU_MAX_FREQUENCY}= 4400
26-
${PLATFORM_CPU_SPEED}= 2.50
27-
${PLATFORM_RAM_SPEED}= 4200
28-
${PLATFORM_RAM_SIZE}= 4209492
29-
30-
@{ETH_PERF_PAIR_2_G}= enp5s0 enp6s0
31-
@{ETH_PERF_PAIR_10_G}= enp2s0f0np0 enp2s0f1np1
32-
33-
@{ETH_PORTS}= 64-62-66-22-84-f5
34-
... 64-62-66-22-84-f6
35-
... 64-62-66-22-84-f7
36-
... 64-62-66-22-84-f8
37-
38-
${SATA_SUPPORT}= ${True}
39-
${TESTS_IN_XCP_NG_SUPPORT}= ${True}
40-
@{TESTED_LINUX_DISTROS}= ${ENV_ID_UBUNTU} ${ENV_ID_XCP_NG}
6+
${INITIAL_DUT_CONNECTION_METHOD}= Telnet
7+
${DUT_CONNECTION_METHOD}= ${INITIAL_DUT_CONNECTION_METHOD}
8+
${INITIAL_CPU_FREQUENCY}= 1100
9+
${DEF_CORES_PER_SOCKET}= 2
10+
${DEF_THREADS_PER_CORE}= 2
11+
${DEF_THREADS_TOTAL}= 4
12+
${DEF_ONLINE_CPU}= 0-3
13+
${DEF_SOCKETS}= 1
14+
15+
${POWER_CTRL}= sonoff
16+
${WIFI_CARD_UBUNTU}= Qualcomm Atheros QCA6174 802.11ac Wireless Network Adapter
17+
${LTE_CARD}= ${TBD}
18+
${DEVICE_NVME_DISK}= Non-Volatile memory controller
19+
${USB_MODEL}= SanDisk
20+
21+
${DMIDECODE_PRODUCT_NAME}= VP6650
22+
${HAS_E_CORES}= ${TRUE}
23+
24+
${CPU_MIN_FREQUENCY}= 400
25+
${CPU_MAX_FREQUENCY}= 4400
26+
${PLATFORM_CPU_SPEED}= 2.50
27+
${PLATFORM_RAM_SPEED}= 4200
28+
${PLATFORM_RAM_SIZE}= 4209492
29+
30+
@{ETH_PERF_PAIR_2_G}= enp5s0 enp6s0
31+
@{ETH_PERF_PAIR_10_G}= enp2s0f0np0 enp2s0f1np1
32+
33+
@{ETH_PORTS}= 64-62-66-22-84-f5
34+
... 64-62-66-22-84-f6
35+
... 64-62-66-22-84-f7
36+
... 64-62-66-22-84-f8
37+
38+
${SATA_SUPPORT}= ${True}
39+
${TESTS_IN_XCP_NG_SUPPORT}= ${True}
40+
@{TESTED_LINUX_DISTROS}= ${ENV_ID_UBUNTU} ${ENV_ID_XCP_NG}
4141

4242
# TODO - define in platform configs depending on platforms fmap
4343
${COREBOOT_REDUNDANT_BOOT_BOOTBLOCK_OFFSET}= ${None}
44-
${COREBOOT_REDUNDANT_BOOT_COREBOOT_OFFSET}= ${None}
44+
${COREBOOT_REDUNDANT_BOOT_COREBOOT_OFFSET}= ${None}
45+
4546

4647
*** Keywords ***
4748
Power On

0 commit comments

Comments
 (0)