Skip to content

Commit 0e4ba84

Browse files
committed
Update test data to account for change task name member
Per [the corresponding hubris PR], update all the test data to similarly replace `task.$name.name` with `task.$name.bin-crate`. [the corresponding hubris PR]: oxidecomputer/hubris#2195
1 parent 9cf9d76 commit 0e4ba84

File tree

135 files changed

+1933
-1933
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

135 files changed

+1933
-1933
lines changed

humility-bin/tests/cmd/extract/extract.chilly.0.stdout

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ dma = true
4949

5050
[tasks.jefe]
5151
path = "../../task/jefe"
52-
name = "task-jefe"
52+
bin-crate = "task-jefe"
5353
priority = 0
5454
requires = {flash = 8192, ram = 2048}
5555
start = true
@@ -58,7 +58,7 @@ stacksize = 1536
5858

5959
[tasks.net]
6060
path = "../../task/net"
61-
name = "task-net"
61+
bin-crate = "task-net"
6262
stacksize = 3800
6363
priority = 2
6464
features = ["mgmt", "h753", "gimlet"]
@@ -73,7 +73,7 @@ task-slots = ["sys", "rcc_driver",
7373

7474
[tasks.sys]
7575
path = "../../drv/stm32xx-sys"
76-
name = "drv-stm32xx-sys"
76+
bin-crate = "drv-stm32xx-sys"
7777
features = ["h753"]
7878
priority = 1
7979
requires = {flash = 2048, ram = 1024}
@@ -82,7 +82,7 @@ start = true
8282

8383
[tasks.spi4_driver]
8484
path = "../../drv/stm32h7-spi-server"
85-
name = "drv-stm32h7-spi-server"
85+
bin-crate = "drv-stm32h7-spi-server"
8686
priority = 2
8787
requires = {flash = 16384, ram = 2048}
8888
features = ["spi4", "h753"]
@@ -97,7 +97,7 @@ global_config = "spi4"
9797

9898
[tasks.spi2_driver]
9999
path = "../../drv/stm32h7-spi-server"
100-
name = "drv-stm32h7-spi-server"
100+
bin-crate = "drv-stm32h7-spi-server"
101101
priority = 2
102102
requires = {flash = 16384, ram = 2048}
103103
features = ["spi2", "h753"]
@@ -112,7 +112,7 @@ global_config = "spi2"
112112

113113
[tasks.i2c_driver]
114114
path = "../../drv/stm32h7-i2c-server"
115-
name = "drv-stm32h7-i2c-server"
115+
bin-crate = "drv-stm32h7-i2c-server"
116116
features = ["h753", "itm"]
117117
priority = 2
118118
requires = {flash = 16384, ram = 2048}
@@ -130,7 +130,7 @@ task-slots = ["sys"]
130130

131131
[tasks.spd]
132132
path = "../../task/spd"
133-
name = "task-spd"
133+
bin-crate = "task-spd"
134134
features = ["h753", "itm"]
135135
priority = 2
136136
requires = {flash = 16384, ram = 16384}
@@ -144,7 +144,7 @@ task-slots = ["sys", "i2c_driver"]
144144

145145
[tasks.thermal]
146146
path = "../../task/thermal"
147-
name = "task-thermal"
147+
bin-crate = "task-thermal"
148148
features = ["itm", "h753", "gimlet"]
149149
priority = 3
150150
requires = {flash = 32768, ram = 8192 }
@@ -154,7 +154,7 @@ task-slots = ["i2c_driver", "sensor", "gimlet_seq"]
154154

155155
[tasks.power]
156156
path = "../../task/power"
157-
name = "task-power"
157+
bin-crate = "task-power"
158158
features = ["itm", "h753"]
159159
priority = 3
160160
requires = {flash = 16384, ram = 4096 }
@@ -164,7 +164,7 @@ task-slots = ["i2c_driver", "sensor", "gimlet_seq"]
164164

165165
[tasks.hiffy]
166166
path = "../../task/hiffy"
167-
name = "task-hiffy"
167+
bin-crate = "task-hiffy"
168168
features = ["h753", "stm32h7", "itm", "i2c", "gpio", "spi", "qspi"]
169169
priority = 3
170170
requires = {flash = 32768, ram = 32768 }
@@ -174,7 +174,7 @@ task-slots = ["sys", "hf", "i2c_driver"]
174174

175175
[tasks.gimlet_seq]
176176
path = "../../drv/gimlet-seq-server"
177-
name = "drv-gimlet-seq-server"
177+
bin-crate = "drv-gimlet-seq-server"
178178
features = ["h753"]
179179
priority = 3
180180
requires = {flash = 65536, ram = 4096 }
@@ -188,7 +188,7 @@ register_defs = "gimlet_regs.json"
188188

189189
[tasks.hf]
190190
path = "../../drv/gimlet-hf-server"
191-
name = "drv-gimlet-hf-server"
191+
bin-crate = "drv-gimlet-hf-server"
192192
features = ["h753"]
193193
priority = 3
194194
requires = {flash = 16384, ram = 2048 }
@@ -200,7 +200,7 @@ task-slots = ["sys"]
200200

201201
[tasks.sensor]
202202
path = "../../task/sensor"
203-
name = "task-sensor"
203+
bin-crate = "task-sensor"
204204
features = ["itm"]
205205
priority = 3
206206
requires = {flash = 8192, ram = 2048 }
@@ -209,7 +209,7 @@ start = true
209209

210210
[tasks.udpecho]
211211
path = "../../task/udpecho"
212-
name = "task-udpecho"
212+
bin-crate = "task-udpecho"
213213
priority = 3
214214
requires = {flash = 16384, ram = 8192}
215215
stacksize = 4096
@@ -218,7 +218,7 @@ task-slots = ["net"]
218218

219219
[tasks.validate]
220220
path = "../../task/validate"
221-
name = "task-validate"
221+
bin-crate = "task-validate"
222222
priority = 3
223223
requires = {flash = 8192, ram = 4096 }
224224
stacksize = 1000
@@ -227,7 +227,7 @@ task-slots = ["i2c_driver"]
227227

228228
[tasks.idle]
229229
path = "../../task/idle"
230-
name = "task-idle"
230+
bin-crate = "task-idle"
231231
priority = 5
232232
requires = {flash = 128, ram = 256}
233233
stacksize = 256

humility-bin/tests/cmd/extract/extract.control_plane_agent.overflow.0.stdout

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ size = 256
1818
default = true
1919

2020
[tasks.jefe]
21-
name = "task-jefe"
21+
bin-crate = "task-jefe"
2222
priority = 0
2323
max-sizes = {flash = 16384, ram = 2048}
2424
start = true
@@ -38,7 +38,7 @@ set_reset_reason = ["sys"]
3838
request_reset = ["hiffy", "control_plane_agent"]
3939

4040
[tasks.net]
41-
name = "task-net"
41+
bin-crate = "task-net"
4242
stacksize = 8000
4343
priority = 5
4444
features = ["mgmt", "h753", "gimlet", "vlan", "vpd-mac"]
@@ -51,7 +51,7 @@ task-slots = ["sys", "packrat", { spi_driver = "spi2_driver" }, "jefe"]
5151
notifications = ["eth-irq", "mdio-timer-irq", "wake-timer", "jefe-state-change"]
5252

5353
[tasks.sys]
54-
name = "drv-stm32xx-sys"
54+
bin-crate = "drv-stm32xx-sys"
5555
features = ["h753", "exti", "no-panic"]
5656
priority = 1
5757
uses = ["rcc", "gpios", "system_flash", "syscfg", "exti"]
@@ -80,7 +80,7 @@ pin = 3
8080
owner = {name = "sprot", notification = "rot_irq"}
8181

8282
[tasks.spi2_driver]
83-
name = "drv-stm32h7-spi-server"
83+
bin-crate = "drv-stm32h7-spi-server"
8484
priority = 3
8585
max-sizes = {flash = 16384, ram = 4096}
8686
features = ["spi2", "h753"]
@@ -92,7 +92,7 @@ task-slots = ["sys"]
9292
notifications = ["spi-irq"]
9393

9494
[tasks.i2c_driver]
95-
name = "drv-stm32xx-i2c-server"
95+
bin-crate = "drv-stm32xx-i2c-server"
9696
stacksize = 1048
9797
features = ["h753"]
9898
priority = 3
@@ -110,7 +110,7 @@ notifications = ["i2c2-irq", "i2c3-irq", "i2c4-irq"]
110110
"i2c4.error" = "i2c4-irq"
111111

112112
[tasks.spd]
113-
name = "task-spd"
113+
bin-crate = "task-spd"
114114
features = ["h753"]
115115
priority = 2
116116
max-sizes = {flash = 16384, ram = 16384}
@@ -124,15 +124,15 @@ notifications = ["i2c1-irq", "jefe-state-change"]
124124
"i2c1.error" = "i2c1-irq"
125125

126126
[tasks.packrat]
127-
name = "task-packrat"
127+
bin-crate = "task-packrat"
128128
priority = 1
129129
start = true
130130
# task-slots is explicitly empty: packrat should not send IPCs!
131131
task-slots = []
132132
features = ["gimlet"]
133133

134134
[tasks.thermal]
135-
name = "task-thermal"
135+
bin-crate = "task-thermal"
136136
features = ["gimlet"]
137137
priority = 5
138138
max-sizes = {flash = 32768, ram = 8192 }
@@ -142,7 +142,7 @@ task-slots = ["i2c_driver", "sensor", "gimlet_seq", "jefe"]
142142
notifications = ["timer"]
143143

144144
[tasks.power]
145-
name = "task-power"
145+
bin-crate = "task-power"
146146
features = ["gimlet"]
147147
priority = 6
148148
max-sizes = {flash = 65536, ram = 16384 }
@@ -152,7 +152,7 @@ task-slots = ["i2c_driver", "sensor", "gimlet_seq"]
152152
notifications = ["timer", "external_badness"]
153153

154154
[tasks.hiffy]
155-
name = "task-hiffy"
155+
bin-crate = "task-hiffy"
156156
features = ["h753", "stm32h7", "i2c", "gpio", "spi", "qspi", "hash", "sprot"]
157157
priority = 5
158158
max-sizes = {flash = 32768, ram = 32768 }
@@ -161,7 +161,7 @@ start = true
161161
task-slots = ["sys", "hf", "i2c_driver", "hash_driver", "update_server", "sprot"]
162162

163163
[tasks.gimlet_seq]
164-
name = "drv-gimlet-seq-server"
164+
bin-crate = "drv-gimlet-seq-server"
165165
features = ["h753"]
166166
priority = 4
167167
max-sizes = {flash = 131072, ram = 16384 }
@@ -176,7 +176,7 @@ fpga_image = "fpga-b.bin"
176176
register_defs = "gimlet-regs-b.json"
177177

178178
[tasks.gimlet_inspector]
179-
name = "task-gimlet-inspector"
179+
bin-crate = "task-gimlet-inspector"
180180
priority = 6
181181
features = ["vlan"]
182182
max-sizes = {flash = 16384, ram = 4096 }
@@ -186,7 +186,7 @@ task-slots = ["net", {seq = "gimlet_seq"}]
186186
notifications = ["socket"]
187187

188188
[tasks.hash_driver]
189-
name = "drv-stm32h7-hash-server"
189+
bin-crate = "drv-stm32h7-hash-server"
190190
features = ["h753"]
191191
priority = 2
192192
max-sizes = {flash = 16384, ram=4096 }
@@ -198,7 +198,7 @@ task-slots = ["sys"]
198198
notifications = ["hash-irq"]
199199

200200
[tasks.hf]
201-
name = "drv-gimlet-hf-server"
201+
bin-crate = "drv-gimlet-hf-server"
202202
features = ["h753", "hash"]
203203
priority = 3
204204
max-sizes = {flash = 16384, ram = 4096 }
@@ -210,7 +210,7 @@ task-slots = ["sys", "hash_driver"]
210210
notifications = ["qspi-irq"]
211211

212212
[tasks.update_server]
213-
name = "stm32h7-update-server"
213+
bin-crate = "stm32h7-update-server"
214214
priority = 3
215215
max-sizes = {flash = 16384, ram = 4096}
216216
stacksize = 2048
@@ -221,14 +221,14 @@ interrupts = {"flash_controller.irq" = "flash-irq"}
221221
notifications = ["flash-irq"]
222222

223223
[tasks.sensor]
224-
name = "task-sensor"
224+
bin-crate = "task-sensor"
225225
priority = 4
226226
max-sizes = {flash = 16384, ram = 8192 }
227227
stacksize = 1024
228228
start = true
229229

230230
[tasks.host_sp_comms]
231-
name = "task-host-sp-comms"
231+
bin-crate = "task-host-sp-comms"
232232
features = ["stm32h753", "uart7", "baud_rate_3M", "hardware_flow_control", "vlan", "gimlet"]
233233
uses = ["uart7", "dbgmcu"]
234234
interrupts = {"uart7.irq" = "usart-irq"}
@@ -240,7 +240,7 @@ task-slots = ["sys", "gimlet_seq", "hf", "control_plane_agent", "net", "packrat"
240240
notifications = ["jefe-state-change", "usart-irq", "multitimer", "control-plane-agent"]
241241

242242
[tasks.udpecho]
243-
name = "task-udpecho"
243+
bin-crate = "task-udpecho"
244244
priority = 6
245245
max-sizes = {flash = 16384, ram = 8192}
246246
stacksize = 4096
@@ -250,7 +250,7 @@ features = ["vlan"]
250250
notifications = ["socket"]
251251

252252
[tasks.udpbroadcast]
253-
name = "task-udpbroadcast"
253+
bin-crate = "task-udpbroadcast"
254254
priority = 6
255255
max-sizes = {flash = 16384, ram = 8192}
256256
stacksize = 2048
@@ -260,7 +260,7 @@ features = ["vlan"]
260260
notifications = ["socket"]
261261

262262
[tasks.control_plane_agent]
263-
name = "task-control-plane-agent"
263+
bin-crate = "task-control-plane-agent"
264264
priority = 6
265265
max-sizes = {flash = 131072, ram = 32768}
266266
stacksize = 4096
@@ -292,7 +292,7 @@ notifications = ["usart-irq", "socket", "timer"]
292292
interrupts = {"usart1.irq" = "usart-irq"}
293293

294294
[tasks.sprot]
295-
name = "drv-stm32h7-sprot-server"
295+
bin-crate = "drv-stm32h7-sprot-server"
296296
priority = 4
297297
max-sizes = {flash = 65536, ram = 32768}
298298
stacksize = 16384
@@ -304,23 +304,23 @@ notifications = ["spi-irq", "rot-irq", "timer"]
304304
interrupts = {"spi4.irq" = "spi-irq"}
305305

306306
[tasks.validate]
307-
name = "task-validate"
307+
bin-crate = "task-validate"
308308
priority = 5
309309
max-sizes = {flash = 16384, ram = 4096 }
310310
stacksize = 1000
311311
start = true
312312
task-slots = ["i2c_driver"]
313313

314314
[tasks.vpd]
315-
name = "task-vpd"
315+
bin-crate = "task-vpd"
316316
priority = 4
317317
max-sizes = {flash = 8192, ram = 1024}
318318
start = true
319319
task-slots = ["sys", "i2c_driver"]
320320
stacksize = 800
321321

322322
[tasks.user_leds]
323-
name = "drv-user-leds"
323+
bin-crate = "drv-user-leds"
324324
features = ["stm32h7"]
325325
priority = 2
326326
max-sizes = {flash = 2048, ram = 1024}
@@ -329,7 +329,7 @@ task-slots = ["sys"]
329329
notifications = ["timer"]
330330

331331
[tasks.dump_agent]
332-
name = "task-dump-agent"
332+
bin-crate = "task-dump-agent"
333333
priority = 6
334334
max-sizes = {flash = 32768, ram = 16384 }
335335
start = true
@@ -340,15 +340,15 @@ notifications = ["socket"]
340340
features = ["net", "vlan"]
341341

342342
[tasks.sbrmi]
343-
name = "drv-sbrmi"
343+
bin-crate = "drv-sbrmi"
344344
priority = 4
345345
max-sizes = {flash = 8192, ram = 2048 }
346346
start = true
347347
task-slots = ["i2c_driver"]
348348
stacksize = 800
349349

350350
[tasks.idle]
351-
name = "task-idle"
351+
bin-crate = "task-idle"
352352
priority = 8
353353
max-sizes = {flash = 128, ram = 256}
354354
stacksize = 256

0 commit comments

Comments
 (0)