From 84eb5fd389bc4ae247048d1f20ec9577935f4f04 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Thu, 1 Jun 2017 11:17:54 +0200 Subject: config: split and refactor Introduce generic config.Load function that can be reused across multiple programs (syz-manager, syz-gce, etc). Move the generic config functionality to pkg/config package. The idea is to move all helper (non-main) packages to pkg/ dir, because we have more and more of them and they pollute the top dir. Move the syz-manager config parts into syz-manager/config package. --- tools/syz-crush/crush.go | 2 +- tools/syz-repro/repro.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tools') diff --git a/tools/syz-crush/crush.go b/tools/syz-crush/crush.go index d519107f9..f1796baf0 100644 --- a/tools/syz-crush/crush.go +++ b/tools/syz-crush/crush.go @@ -18,8 +18,8 @@ import ( "syscall" "time" - "github.com/google/syzkaller/config" . "github.com/google/syzkaller/log" + "github.com/google/syzkaller/syz-manager/config" "github.com/google/syzkaller/vm" _ "github.com/google/syzkaller/vm/adb" _ "github.com/google/syzkaller/vm/gce" diff --git a/tools/syz-repro/repro.go b/tools/syz-repro/repro.go index 841a121d1..064846991 100644 --- a/tools/syz-repro/repro.go +++ b/tools/syz-repro/repro.go @@ -11,10 +11,10 @@ import ( "os/signal" "syscall" - "github.com/google/syzkaller/config" "github.com/google/syzkaller/csource" . "github.com/google/syzkaller/log" "github.com/google/syzkaller/repro" + "github.com/google/syzkaller/syz-manager/config" "github.com/google/syzkaller/vm" _ "github.com/google/syzkaller/vm/adb" _ "github.com/google/syzkaller/vm/gce" -- cgit mrf-deployment