aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2017-06-17 12:47:35 +0200
committerDmitry Vyukov <dvyukov@google.com>2017-06-17 14:41:15 +0200
commite8e63830a60fc048df976188bf726abc32045162 (patch)
tree9e38c6b9d3e6cbaeba29cc5b29ed36aac0706d3d
parentbaad3b4b027658f49ba318c41dfc745788ba87d1 (diff)
pkg/ipc: move from ipc
-rw-r--r--pkg/ipc/gate.go (renamed from ipc/gate.go)0
-rw-r--r--pkg/ipc/ipc.go (renamed from ipc/ipc.go)0
-rw-r--r--pkg/ipc/ipc_test.go (renamed from ipc/ipc_test.go)3
-rw-r--r--syz-fuzzer/fuzzer.go2
-rw-r--r--tools/syz-execprog/execprog.go2
-rw-r--r--tools/syz-stress/stress.go2
6 files changed, 5 insertions, 4 deletions
diff --git a/ipc/gate.go b/pkg/ipc/gate.go
index b1b1f1fc8..b1b1f1fc8 100644
--- a/ipc/gate.go
+++ b/pkg/ipc/gate.go
diff --git a/ipc/ipc.go b/pkg/ipc/ipc.go
index 6c68433b6..6c68433b6 100644
--- a/ipc/ipc.go
+++ b/pkg/ipc/ipc.go
diff --git a/ipc/ipc_test.go b/pkg/ipc/ipc_test.go
index 00c1cd95c..b7d591d5d 100644
--- a/ipc/ipc_test.go
+++ b/pkg/ipc/ipc_test.go
@@ -6,6 +6,7 @@ package ipc
import (
"math/rand"
"os"
+ "path/filepath"
"testing"
"time"
@@ -17,7 +18,7 @@ import (
const timeout = 10 * time.Second
func buildExecutor(t *testing.T) string {
- return buildProgram(t, "../executor/executor.cc")
+ return buildProgram(t, filepath.FromSlash("../../executor/executor.cc"))
}
func buildSource(t *testing.T, src []byte) string {
diff --git a/syz-fuzzer/fuzzer.go b/syz-fuzzer/fuzzer.go
index 2b9939d4c..09d3e5034 100644
--- a/syz-fuzzer/fuzzer.go
+++ b/syz-fuzzer/fuzzer.go
@@ -21,10 +21,10 @@ import (
"syscall"
"time"
- "github.com/google/syzkaller/ipc"
"github.com/google/syzkaller/pkg/cover"
"github.com/google/syzkaller/pkg/hash"
"github.com/google/syzkaller/pkg/host"
+ "github.com/google/syzkaller/pkg/ipc"
. "github.com/google/syzkaller/pkg/log"
"github.com/google/syzkaller/pkg/osutil"
"github.com/google/syzkaller/prog"
diff --git a/tools/syz-execprog/execprog.go b/tools/syz-execprog/execprog.go
index 42aed53f3..825052ffc 100644
--- a/tools/syz-execprog/execprog.go
+++ b/tools/syz-execprog/execprog.go
@@ -18,8 +18,8 @@ import (
"syscall"
"time"
- "github.com/google/syzkaller/ipc"
"github.com/google/syzkaller/pkg/cover"
+ "github.com/google/syzkaller/pkg/ipc"
. "github.com/google/syzkaller/pkg/log"
"github.com/google/syzkaller/prog"
)
diff --git a/tools/syz-stress/stress.go b/tools/syz-stress/stress.go
index f4b0ae565..9d1ea2465 100644
--- a/tools/syz-stress/stress.go
+++ b/tools/syz-stress/stress.go
@@ -13,9 +13,9 @@ import (
"sync/atomic"
"time"
- "github.com/google/syzkaller/ipc"
"github.com/google/syzkaller/pkg/db"
"github.com/google/syzkaller/pkg/host"
+ "github.com/google/syzkaller/pkg/ipc"
. "github.com/google/syzkaller/pkg/log"
"github.com/google/syzkaller/prog"
"github.com/google/syzkaller/sys"