From fbedd425b575868124577640fe02c9c0a73c4be3 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Wed, 1 Aug 2018 21:35:13 +0200 Subject: pkg/mgrconfig: move from syz-manager/mgrconfig mgrconfig was used only by syz-manager initially, but now it's used by a dozen of packages and it's weird to import from under a binary dir. pkg/ is much more reasonable dir for a widely used helper package. --- tools/syz-bisect/bisect.go | 2 +- tools/syz-crush/crush.go | 2 +- tools/syz-mutate/mutate.go | 2 +- tools/syz-repro/repro.go | 2 +- tools/syz-symbolize/symbolize.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'tools') diff --git a/tools/syz-bisect/bisect.go b/tools/syz-bisect/bisect.go index 0f4657223..ec68f4b95 100644 --- a/tools/syz-bisect/bisect.go +++ b/tools/syz-bisect/bisect.go @@ -14,7 +14,7 @@ import ( "github.com/google/syzkaller/pkg/bisect" "github.com/google/syzkaller/pkg/config" - "github.com/google/syzkaller/syz-manager/mgrconfig" + "github.com/google/syzkaller/pkg/mgrconfig" ) var ( diff --git a/tools/syz-crush/crush.go b/tools/syz-crush/crush.go index ee020b74f..3d184d5a4 100644 --- a/tools/syz-crush/crush.go +++ b/tools/syz-crush/crush.go @@ -15,10 +15,10 @@ import ( "github.com/google/syzkaller/pkg/instance" "github.com/google/syzkaller/pkg/log" + "github.com/google/syzkaller/pkg/mgrconfig" "github.com/google/syzkaller/pkg/osutil" "github.com/google/syzkaller/pkg/report" "github.com/google/syzkaller/prog" - "github.com/google/syzkaller/syz-manager/mgrconfig" "github.com/google/syzkaller/vm" ) diff --git a/tools/syz-mutate/mutate.go b/tools/syz-mutate/mutate.go index 73957c246..c3038064f 100644 --- a/tools/syz-mutate/mutate.go +++ b/tools/syz-mutate/mutate.go @@ -14,9 +14,9 @@ import ( "strings" "time" + "github.com/google/syzkaller/pkg/mgrconfig" "github.com/google/syzkaller/prog" _ "github.com/google/syzkaller/sys" - "github.com/google/syzkaller/syz-manager/mgrconfig" ) var ( diff --git a/tools/syz-repro/repro.go b/tools/syz-repro/repro.go index d585ed9a1..d406f34c8 100644 --- a/tools/syz-repro/repro.go +++ b/tools/syz-repro/repro.go @@ -11,11 +11,11 @@ import ( "github.com/google/syzkaller/pkg/csource" "github.com/google/syzkaller/pkg/log" + "github.com/google/syzkaller/pkg/mgrconfig" "github.com/google/syzkaller/pkg/osutil" "github.com/google/syzkaller/pkg/report" "github.com/google/syzkaller/pkg/repro" "github.com/google/syzkaller/prog" - "github.com/google/syzkaller/syz-manager/mgrconfig" "github.com/google/syzkaller/vm" ) diff --git a/tools/syz-symbolize/symbolize.go b/tools/syz-symbolize/symbolize.go index 169dad840..8ce2f73ff 100644 --- a/tools/syz-symbolize/symbolize.go +++ b/tools/syz-symbolize/symbolize.go @@ -10,8 +10,8 @@ import ( "os" "runtime" + "github.com/google/syzkaller/pkg/mgrconfig" "github.com/google/syzkaller/pkg/report" - "github.com/google/syzkaller/syz-manager/mgrconfig" ) var ( -- cgit mrf-deployment