Skip to content

Commit

Permalink
cmd/go: 3 cmd/go tests (>8s) made as non-short scripts
Browse files Browse the repository at this point in the history
* TestAtomicCoverpkgAll -> Script/cover_atomic_pkgall.txt and make it
* non-short
* TestCoverpkgAllRuntime -> Script/cover_pkgall_runtime.txt and make it
* non-short
* TestCpuprofileTwice -> Script/cpu_profile_twice.txt and make it
* non-short
* TestGoTestMainTwice -> make it non-short

Updates #26472

Change-Id: I24f3d4c2a8b6e317adb369a1b1426e693f9571ed
Reviewed-on: https://go-review.googlesource.com/126636
Reviewed-by: Bryan C. Mills <[email protected]>
Run-TryBot: Bryan C. Mills <[email protected]>
TryBot-Result: Gobot Gobot <[email protected]>
  • Loading branch information
shivakumargn authored and Bryan C. Mills committed Aug 7, 2018
1 parent a685a8d commit 15c106d
Show file tree
Hide file tree
Showing 4 changed files with 67 additions and 51 deletions.
54 changes: 3 additions & 51 deletions src/cmd/go/go_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3047,6 +3047,9 @@ func TestGoTestMainAsNormalTest(t *testing.T) {
}

func TestGoTestMainTwice(t *testing.T) {
if testing.Short() {
t.Skip("Skipping in short mode")
}
tg := testgo(t)
defer tg.cleanup()
tg.makeTempdir()
Expand Down Expand Up @@ -5817,57 +5820,6 @@ func init() {}
tg.run("test", "a")
}

// Issue 23150.
func TestCpuprofileTwice(t *testing.T) {
tg := testgo(t)
defer tg.cleanup()
tg.parallel()
tg.tempFile("prof/src/x/x_test.go", `
package x_test
import (
"testing"
"time"
)
func TestSleep(t *testing.T) { time.Sleep(10 * time.Millisecond) }`)
tg.setenv("GOPATH", tg.path("prof"))
bin := tg.path("x.test")
out := tg.path("cpu.out")
tg.run("test", "-o="+bin, "-cpuprofile="+out, "x")
tg.must(os.Remove(out))
tg.run("test", "-o="+bin, "-cpuprofile="+out, "x")
tg.mustExist(out)
}

// Issue 23694.
func TestAtomicCoverpkgAll(t *testing.T) {
tg := testgo(t)
defer tg.cleanup()
tg.parallel()

tg.tempFile("src/x/x.go", `package x; import _ "sync/atomic"; func F() {}`)
tg.tempFile("src/x/x_test.go", `package x; import "testing"; func TestF(t *testing.T) { F() }`)
tg.setenv("GOPATH", tg.path("."))
tg.run("test", "-coverpkg=all", "-covermode=atomic", "x")
if canRace {
tg.run("test", "-coverpkg=all", "-race", "x")
}
}

// Issue 23882.
func TestCoverpkgAllRuntime(t *testing.T) {
tg := testgo(t)
defer tg.cleanup()
tg.parallel()

tg.tempFile("src/x/x.go", `package x; import _ "runtime"; func F() {}`)
tg.tempFile("src/x/x_test.go", `package x; import "testing"; func TestF(t *testing.T) { F() }`)
tg.setenv("GOPATH", tg.path("."))
tg.run("test", "-coverpkg=all", "x")
if canRace {
tg.run("test", "-coverpkg=all", "-race", "x")
}
}

func TestBadCommandLines(t *testing.T) {
tg := testgo(t)
defer tg.cleanup()
Expand Down
23 changes: 23 additions & 0 deletions src/cmd/go/testdata/script/cover_atomic_pkgall.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
[short] skip

go test -coverpkg=all -covermode=atomic x
stdout ok[\s\S]+?coverage

[!race] stop

go test -coverpkg=all -race x
stdout ok[\s\S]+?coverage

-- x/x.go --
package x

import _ "sync/atomic"

func F() {}

-- x/x_test.go --
package x

import "testing"

func TestF(t *testing.T) { F() }
21 changes: 21 additions & 0 deletions src/cmd/go/testdata/script/cover_pkgall_runtime.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Issue 23882

[short] skip

go test -coverpkg=all x
stdout ok[\s\S]+?coverage

[!race] stop

go test -coverpkg=all -race x
stdout ok[\s\S]+?coverage

-- x/x.go --
package x
import _ "runtime"
func F() {}

-- x/x_test.go --
package x
import "testing"
func TestF(t *testing.T) { F() }
20 changes: 20 additions & 0 deletions src/cmd/go/testdata/script/cpu_profile_twice.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Issue 23150

[short] skip

go test -o=$WORK/x.test -cpuprofile=$WORK/cpu_profile_twice.out x
rm $WORK/cpu_profile_twice.out

go test -o=$WORK/x.test -cpuprofile=$WORK/cpu_profile_twice.out x
exists $WORK/cpu_profile_twice.out


-- x/x_test.go --
package x_test
import (
"testing"
"time"
)
func TestSleep(t *testing.T) {
time.Sleep(10 * time.Millisecond)
}

0 comments on commit 15c106d

Please sign in to comment.