From 52a33fd516102a98d3753bf69417235b655a68dc Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Thu, 14 Sep 2017 19:25:01 +0200 Subject: 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. --- pkg/ipc/ipc_test.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'pkg/ipc') diff --git a/pkg/ipc/ipc_test.go b/pkg/ipc/ipc_test.go index ce04a7540..263e94032 100644 --- a/pkg/ipc/ipc_test.go +++ b/pkg/ipc/ipc_test.go @@ -19,10 +19,6 @@ import ( const timeout = 10 * time.Second -func init() { - prog.SetDefaultTarget("linux", runtime.GOARCH) -} - func buildExecutor(t *testing.T) string { return buildProgram(t, filepath.FromSlash("../../executor/executor.cc")) } @@ -87,6 +83,11 @@ func TestExecute(t *testing.T) { rs, iters := initTest(t) flags := []uint64{0, FlagThreaded, FlagThreaded | FlagCollide} + target, err := prog.GetTarget("linux", runtime.GOARCH) + if err != nil { + t.Fatal(err) + } + bin := buildExecutor(t) defer os.Remove(bin) @@ -103,7 +104,7 @@ func TestExecute(t *testing.T) { defer env.Close() for i := 0; i < iters/len(flags); i++ { - p := prog.Generate(rs, 10, nil) + p := target.Generate(rs, 10, nil) opts := &ExecOpts{} output, _, _, _, err := env.Exec(opts, p) if err != nil { -- cgit mrf-deployment