aboutsummaryrefslogtreecommitdiffstats
path: root/pkg/mgrconfig
diff options
context:
space:
mode:
authorAleksandr Nogikh <nogikh@google.com>2025-04-22 11:57:52 +0200
committerAleksandr Nogikh <nogikh@google.com>2025-04-22 12:28:43 +0000
commit53a8b9bd23a6fac52f298fb6115c012757f0a505 (patch)
tree5d38be95d9f40f27f1cccd6b4ce4fbea0fd77725 /pkg/mgrconfig
parentee0bd1607af85b55b2a3094f4981a1946286fac5 (diff)
tools: repair syz-testbuild
1. Properly set up a manager config. 2. Use clang/ld.lld by default. 3. Set the right boot partition for qemu VMs.
Diffstat (limited to 'pkg/mgrconfig')
-rw-r--r--pkg/mgrconfig/load.go20
1 files changed, 13 insertions, 7 deletions
diff --git a/pkg/mgrconfig/load.go b/pkg/mgrconfig/load.go
index 51aaa0657..b92d6a421 100644
--- a/pkg/mgrconfig/load.go
+++ b/pkg/mgrconfig/load.go
@@ -73,7 +73,10 @@ func LoadPartialData(data []byte) (*Config, error) {
if err := config.LoadData(data, cfg); err != nil {
return nil, err
}
- return loadPartial(cfg)
+ if err := SetTargets(cfg); err != nil {
+ return nil, err
+ }
+ return cfg, nil
}
func LoadPartialFile(filename string) (*Config, error) {
@@ -81,7 +84,10 @@ func LoadPartialFile(filename string) (*Config, error) {
if err := config.LoadFile(filename, cfg); err != nil {
return nil, err
}
- return loadPartial(cfg)
+ if err := SetTargets(cfg); err != nil {
+ return nil, err
+ }
+ return cfg, nil
}
func defaultValues() *Config {
@@ -122,21 +128,21 @@ var (
}
)
-func loadPartial(cfg *Config) (*Config, error) {
+func SetTargets(cfg *Config) error {
var err error
cfg.TargetOS, cfg.TargetVMArch, cfg.TargetArch, err = splitTarget(cfg.RawTarget)
if err != nil {
- return nil, err
+ return err
}
cfg.Target, err = prog.GetTarget(cfg.TargetOS, cfg.TargetArch)
if err != nil {
- return nil, err
+ return err
}
cfg.SysTarget = targets.Get(cfg.TargetOS, cfg.TargetVMArch)
if cfg.SysTarget == nil {
- return nil, fmt.Errorf("unsupported OS/arch: %v/%v", cfg.TargetOS, cfg.TargetVMArch)
+ return fmt.Errorf("unsupported OS/arch: %v/%v", cfg.TargetOS, cfg.TargetVMArch)
}
- return cfg, nil
+ return nil
}
func Complete(cfg *Config) error {