Skip to content

Commit

Permalink
cmd/go: convert TestPackageMainTestImportsArchiveNotBinary to a scrip…
Browse files Browse the repository at this point in the history
…t test

Updates #28387
Updates #30316

Change-Id: I31e04c89f2cc226f9b5110f14c8b80a18e937efb
Reviewed-on: https://go-review.googlesource.com/c/go/+/207960
Run-TryBot: Bryan C. Mills <bcmills@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Jay Conrod <jayconrod@google.com>
  • Loading branch information
Bryan C. Mills committed Nov 19, 2019
1 parent 9ebd254 commit 992d2e5
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 31 deletions.
17 changes: 0 additions & 17 deletions src/cmd/go/go_test.go
Expand Up @@ -1315,23 +1315,6 @@ func TestRelativeGOBINFail(t *testing.T) {
tg.grepStderr("cannot install, GOBIN must be an absolute path", "go install must fail if $GOBIN is a relative path")
}

func TestPackageMainTestImportsArchiveNotBinary(t *testing.T) {
tooSlow(t)
tg := testgo(t)
defer tg.cleanup()
tg.parallel()
gobin := filepath.Join(tg.pwd(), "testdata", "bin")
tg.creatingTemp(gobin)
tg.setenv("GOBIN", gobin)
tg.setenv("GOPATH", filepath.Join(tg.pwd(), "testdata"))
tg.must(os.Chtimes("./testdata/src/main_test/m.go", time.Now(), time.Now()))
tg.sleep()
tg.run("test", "main_test")
tg.run("install", "main_test")
tg.wantNotStale("main_test", "", "after go install, main listed as stale")
tg.run("test", "main_test")
}

func TestPackageMainTestCompilerFlags(t *testing.T) {
tg := testgo(t)
defer tg.cleanup()
Expand Down
32 changes: 32 additions & 0 deletions src/cmd/go/testdata/script/test_main_archive.txt
@@ -0,0 +1,32 @@
env GO111MODULE=off

# Test that a main_test of 'package main' imports the package,
# not the installed binary.

[short] skip

env GOBIN=$WORK/bin
go test main_test
go install main_test

go list -f '{{.Stale}}' main_test
stdout false

go test main_test

-- main_test/m.go --
package main

func F() {}
func main() {}
-- main_test/m_test.go --
package main_test

import (
. "main_test"
"testing"
)

func Test1(t *testing.T) {
F()
}
4 changes: 0 additions & 4 deletions src/cmd/go/testdata/src/main_test/m.go

This file was deleted.

10 changes: 0 additions & 10 deletions src/cmd/go/testdata/src/main_test/m_test.go

This file was deleted.

0 comments on commit 992d2e5

Please sign in to comment.