diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2017-09-14 19:25:01 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2017-09-15 16:02:37 +0200 |
| commit | 52a33fd516102a98d3753bf69417235b655a68dc (patch) | |
| tree | 351ab73db934d3b4e4babbe27e8801c659f2631b /tools/syz-upgrade | |
| parent | 25f4fe0662f7f3b390d16b2e786f2ba0aa0293f1 (diff) | |
prog: remove default target and all global state
Now each prog function accepts the desired target explicitly.
No global, implicit state involved.
This is much cleaner and allows cross-OS/arch testing, etc.
Diffstat (limited to 'tools/syz-upgrade')
| -rw-r--r-- | tools/syz-upgrade/upgrade.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/syz-upgrade/upgrade.go b/tools/syz-upgrade/upgrade.go index 0a28a27fb..d833fdc21 100644 --- a/tools/syz-upgrade/upgrade.go +++ b/tools/syz-upgrade/upgrade.go @@ -15,6 +15,7 @@ import ( "io/ioutil" "os" "path/filepath" + "runtime" "github.com/google/syzkaller/pkg/osutil" "github.com/google/syzkaller/prog" @@ -29,13 +30,17 @@ func main() { if err != nil { fatalf("failed to read corpus dir: %v", err) } + target, err := prog.GetTarget(runtime.GOOS, runtime.GOARCH) + if err != nil { + fatalf("%v", err) + } for _, f := range files { fname := filepath.Join(os.Args[1], f.Name()) data, err := ioutil.ReadFile(fname) if err != nil { fatalf("failed to read program: %v", err) } - p, err := prog.Deserialize(data) + p, err := target.Deserialize(data) if err != nil { fatalf("failed to deserialize program: %v", err) } |