From 292e9c9703ae45eed2066b9b8e49f57162339092 Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Thu, 17 Apr 2014 16:25:38 -0400 Subject: cmd/pack: avoid ./ import in test (fix Windows build) It is possible to use ./ imports on Windows but it requires some extra command-line work ('go build' does this automatically, but we can't use 'go build' here). Instead, use an ordinary import and -I/-L, which are easier to use. LGTM=iant R=iant CC=golang-codereviews https://codereview.appspot.com/89040043 --- src/cmd/pack/pack_test.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/cmd/pack') diff --git a/src/cmd/pack/pack_test.go b/src/cmd/pack/pack_test.go index bd4b224af..b2be74b09 100644 --- a/src/cmd/pack/pack_test.go +++ b/src/cmd/pack/pack_test.go @@ -247,7 +247,7 @@ func TestLargeDefs(t *testing.T) { main := filepath.Join(dir, "main.go") prog := ` package main - import "./large" + import "large" var V large.T func main() { println("ok") @@ -267,8 +267,8 @@ func TestLargeDefs(t *testing.T) { run("go", "build", "cmd/pack") // writes pack binary to dir run("go", "tool", char+"g", "large.go") run("./pack", "grc", "large.a", "large."+char) - run("go", "tool", char+"g", "main.go") - run("go", "tool", char+"l", "-o", "a.out", "main."+char) + run("go", "tool", char+"g", "-I", ".", "main.go") + run("go", "tool", char+"l", "-L", ".", "-o", "a.out", "main."+char) out := run("./a.out") if out != "ok\n" { t.Fatal("incorrect output: %q, want %q", out, "ok\n") -- cgit v1.2.1