From 780b27623e2c0284dfb0c8e0392463d1eef00e92 Mon Sep 17 00:00:00 2001 From: Aleksandr Nogikh Date: Wed, 17 Nov 2021 12:36:48 +0000 Subject: tools/syz-testbed: support per-checkout syz-manager configs Let the user of the tool specify individual syz-manager configs for checkouts. A base config is specified as previously and then individual parts of jsons are applied to that base config, e.g. <...> "checkouts": [ { "name": "first", "repo": "https://github.com/google/syzkaller.git", }, { "name": "second", "repo": "https://github.com/google/syzkaller.git", "manager_config": { "kernel_obj": "/tmp/linux-stable2" } } ], "manager_config": { "target": "linux/amd64", "kernel_obj": "/tmp/linux-stable", <...> } <...> --- tools/syz-testbed/instance.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools/syz-testbed/instance.go') diff --git a/tools/syz-testbed/instance.go b/tools/syz-testbed/instance.go index c51b9c597..f7293d289 100644 --- a/tools/syz-testbed/instance.go +++ b/tools/syz-testbed/instance.go @@ -108,7 +108,7 @@ func (ctx *TestbedContext) NewInstance(checkout *Checkout, mgrName string) (*Ins } log.Printf("[%s] Generating syz-manager config", name) - managerCfg := *ctx.ManagerConfig + managerCfg := *checkout.ManagerConfig managerCfg.Name = mgrName managerCfg.Workdir = workdir managerCfg.Syzkaller = checkout.Path -- cgit mrf-deployment