diff options
| author | Aleksandr Nogikh <nogikh@google.com> | 2021-11-17 12:36:48 +0000 |
|---|---|---|
| committer | Aleksandr Nogikh <wp32pw@gmail.com> | 2021-11-19 19:06:55 +0100 |
| commit | 780b27623e2c0284dfb0c8e0392463d1eef00e92 (patch) | |
| tree | c8dcefe94021fc3e0a5693e082a9c3751c64997f /tools/syz-testbed/instance.go | |
| parent | 3a9d0024ba818c5b37058d9ac6fdfc0ddfa78be6 (diff) | |
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",
<...>
}
<...>
Diffstat (limited to 'tools/syz-testbed/instance.go')
| -rw-r--r-- | tools/syz-testbed/instance.go | 2 |
1 files changed, 1 insertions, 1 deletions
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 |